Clean up test grammar
Question grammar