Merge "Test coverage for Dao files"