changes for py3 to be happy about tests