Fix all the tests (except sync and routes)