corrected tests according to the new structure of Models