Move ServiceTestCase to separate module