Merge "Add new tests for DAO"