a little more test cleanup for py3