Prettify tests
Refactoring