Finish dao test. Service test refactor