fix up a few tests