Merge pull request #117 from loganb/master

Fix some broken tests