fixing some resample test failures in master