Fixing a namespacing issue related to catching exceptions in tests.
Merge remote-tracking branch 'origin/master'