Fixed GenericJpaDaoImpl test + some other minor changes