Merge "Modify tests to conform with exception changes"