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

Fixed the 6 failing unit tests
Merge remote-tracking branch 'origin/master' into MAGN-5294
Fix Watch3D setup errors.