MODE-1829 Re-enabled several query tests