FLUID-4919: All Uploader test cases passing again! Real function tests now required. Corrected issue in transformer which failed to transform ALL merge records of a particular type - once a component receives multiple distributions we may have duplicates. Eliminated more manual uses of the staticEnvironment.