refactoring - service/mock integration