Started work on fix-sampling branch
Removed redundant tests
Removed unused imports
Merge pull request #1464 from gem/fix-sampling

Removed redundant tests