Fixed some overly stringent tests
Merge pull request #359 from peastman/master

Fixed some overly stringent tests