Fix tests, add fixtures
Merge branch 'fix_tests'
Merge pull request #2 from ignitionwithin/refactoring

Refactoring