FIx more tests