Additional Changes for [FB-14] test requirments