fixing a few more tests