Changes to DAO test