fix a few tests