Fixing more tests