Merge "Expand MWException tests"