Merge pull request #201 from rwest/fixtests

Fix (or forgive) a bunch of unit tests