fixing up a few tests