refactoring - entity,dao, service -> tests