Improve test coverage of reboot