Fix an issue where tests hang: don't create a new request when no data is
available yet, to avoid going to the 'partial request state'.
Fix tests.