tests updated for stop changes