progress on refacoring tests and adding coverage for all Daos