Fix bad calls to model_query()

model_query() function was changed recently
to use 'model' object as a second positional
argument, so all callers need to adhere to
this requirement.
Fix 'bad' model_query().
Remove 'skips' from tests that were failing
due to bad model_query() calls.
Closes-Bug: #1275026

Change-Id: Ibf3d45c6a37493cc0ced7cc6e6c552f27b6e4338