service tests refaktored