Also, stop weave in end_suite by using `weave stop` which does not remove the weave container (#1939).