[#1865] Faris | Refactored and fixed failing tests.