wip: fix some of the unit tests