fixing few more tests