Rename the tests

Now with servicing before movement