Fix and re-renable Python 3 testing

Change-Id: I1b3df3d7aefbee073f6b9a870113a4be9c285bb2