Fix tests
Fix DAO tests