Changed models were missing 'multiple' flag
Fixed tests to consider new model changes