Beef-up the tests.
Starting query count cleanup