more thorough test
Merge branch 'fix-sampler-tests'