Correcting service class and test