continue fixing Junit tests & DAO classes