Fix units testing after 82477db06524bd57c900476526fa0ebd1a1dd6e6