fixing more tests