Update existing restart tests for new behaviour. Add test for pre-init cycling and restarts.