Move test setup stuff outside of suites, fix py3 err