Added test queries and test query generator, and brushed up test_flexidata.py