Adding restart container with timeout + tests

Closes #6