rename test class for service testing
delete class with old names