Replace @expectedException* annotations with dedicated methods