fixed @expectedException class names
fixed some typos