Address some tests that fail from the Python3 work