Refactored so the existence of a container is checked and added main controller spec
Events are removed on kill