expected exceptions moved to @Test annotations\nrelevant try/catch blocks removed