WIP: tweaks to a couple of tests