Fixed tests to use new sampler