*: fix up broken tests

Prereq for #178/#169