Fixed handling queries with empty token options
Revised Flow program testing (Re #20)
Prefixed conceptual test files