Fixing another test case
Fixing a couple other tests