All updated classes for testing the services