fixed tests
support for pythons setup.py test, boy that was a pain to add
renaming and cleanup