Update tests to reflect real queries
Add post-processing
Attempt to fix this problem
Fix post-validation issues
Merge branch 'more-validation'