Changes is QueryRunner, add tests.