Merge "Fix raising TimeoutException in tests"