Adding DAO junit tests and updated DAO classes