No more skipped tests, and minor update to query formatting