Updated version for PYPI inclusion
Streamlined the test files (only 1 copy each now for all tests)