Merge "Clean up services created after running test"