Add a few more query tests, update auto config.
Add a few more app specific tests.