Merge pull request #52 from matthayes/master

Add more sampling tests