Begun refactoring tests from single monolithic test to DAO-specific tests