Merge "Invalid ApplicationExceptionTest"