DriveDAOTest updated - almost working. Few minor changes in other classes.