Fix Python 3 tests broken by bad merge.