Merge "Exception test Fix"