python-future: Cherry-pick fixes for tests.