[#1865] Godwin/Faris - Fixed failing tests.