Fix some failing tests.
Merge pull request #2704 from myronmarston/fix-failing-tests

Fix some failing tests.