fix a few more tests