cleaned up tests and added service tests