modifications to get test files in the correct folder and have the right UUIDs in tests