Some tests + Everything is a bit more applicative
Cleanup