Merge "Unify assertThrows"