Refactoring
Rewriting a lot of tests