Merge "Test for service type management"