Fix stop behaviour for container in test
Misc tidying up