Subhas/Faris | Fix more functional tests