unit test ok
refactor to facilitate DAO testability
cosmetic change