Fix up too-specific exception handling of affected tests
+ Rename misspelled method