Unit test fix for previous check-in. Modifications to also output any unexpected exception with test result.