Fixing MetadataCensor, adding MakeSampleData.