Remove logging junk, add iter test, pull out basic query test data.