Fixed shuffle displaying when null points present. Reduced problem size for export service test