fixed multi sampler and added tests