[#1865] Faris | Fixed failing test.
[#1865] Godwin/Faris | Fixed failing tests.