Remove use of ExpectedException