Cleaned up service tests and added a ServiceTestSuite