tests upgraded for matrix params + sampler tests