Cleaned up some tests added a few more. Reworked the file structure and ...

...made it more pythonic