Fix some failing tests (wip)