fixed @expectedException class names
fixed typos