XD-1731 Supports UUID suffix for test file names