Various tests with query counts need to be updated now that we have removed a waffle check that was in their codepath.