adding kill/wait

- with tests
- buffing tests to check for state
- removing extra state and saving running condition in containers