kill a spurrious xrange from tests
switch datastructures to direct imports from six