Revert test to old sampler