Python3.x test fixes.