Second Pull Request to primary lom repository

43 Tests running and refactoring of service layer (Entity).