Made a bit of refactor along the way (mainly the tests)