[FIX] Fixes the tests of the TimeoutInputStream.
Fixed conflict