More py3 test wrangling