simplified container

simplified container, removed unused tests and added wait/notify workflow