Bug 1022475 - (Part VI) Fix Python tests