Fix tests for ruby 2.1 and non-rescueable Timeout::Error