Tests now cover multiple types of models