fixed @expectedException class names
fixed some typos
minor #9603 Fixed some typos (fabpot)

This PR was merged into the 2.2 branch.

Discussion
----------

Fixed some typos

Commits
-------

5c6edb3 fixed some typos
8d69bb5 fixed @expectedException class names