Fix up DAO tests