Fix few more tests