Reverted ExpectedException changes and updated ThrowableCauseMatcher as per review