WIP: fix the tests