Ajay | #2230 | Fixing functional tests broken as part of story development