[FIX] Tests
[FIX] More fix on tests
[FIX] Fix all the old tests