* Basic refactoring
* Updated the fixtures
* Fixed up some of the tests