Really fix tests
Merge pull request #90 from bhosmer/master

Really fix tests