Remove use of org.junit.rules.ExpectedException