Improved sorting of UUIDs + corrected typo in test case
Done implementing query tracing