Optimize start-stop test a bit