TEST: fix a few tests