CARE#24: Changed services, updated GenericDaoImpl, added some tests