Adding more tests for raw structured query def