Fix all broken tests.
Merge pull request #1 from gmlewis/fix-broken-tests

Fix all broken tests.