Removed try-catch blocks from test cases and replaced them with ExpectedException.