New DAO's refactoring and testing