Removed test for TimeoutExceptions and minor changes