Merge "Update test-resample to handle multichannel"