Add more AutoQuery tests + minor formatting to AutoQueryFeature