[WIP] Fix test suite