Merge "Use @test.services instead of skipUnless"