Add tests for timeouts with stop and restart
Separate stop and restart container from start and kill to allow for timeout option