Subhas/Faris - Fix more tests