Improving tests using fixtures
Fixing tests
fixing bugs
General refactoring of tests
Updated tests