Some Python 3.x-related testing fixes