Merge pull request #300 from apenney/fix-tests