UPDATE: Increased test coverage on DAO's