Fix stop tests