Fix tests
Merge pull request #89 from bhosmer/master

Fix tests