Merge "Add test for stopServiceResolution"