Fixed sink creation for GenericDataSink in test plan