Merge "Standardises expected exception layout"