Issue #7435: Remove duplicate int/long tests, and other

references to long in py3k.  Patch provided by flox.