[WIP] Fix tests