More test suite cleanup. Trying to get 'python setup.py test' working

Mostly renaming to avoid confusion about what is or isn't a test.