Adding some more tests for restart implementation