Rewrite the tests to fit the changes from #8 and make them more testable as in decoupling the current ones .