When no model is specified, use *only* the default model (previously was all models)

This fixes several unit-tests.