wip: fix broken tests