dao updates and tests