Refactored tests, added test to kill all containers