Add remaining sampler tests