Model: removeQuery() + unit-tests