- fix test breakages after #422