Restored all service tests