Fixed the 6 failing unit tests
Merge pull request #3405 from pboyer/TestFixes

Fixed the 6 failing unit tests