Fixed failing tests.
Merge pull request #197 from pelson/fix_failing_tests

Fixed failing tests.