Move the stop and cleanup bit in to the local service tests too.