Rename test_xrange.py to test_range.py and fix the

type name in various spots.