Enhance precondition for stop tests