Additional test cases, basic restart handling