Make collection mandatory field and fix some specs
Merge remote-tracking branch 'origin/new_instance_models' into new_instance_models