Merge "[CTS] Fix ordering and show directory in list of results" into nyc-dev