Fixing a few more tests