#1859 + @Machaba-Machaba - Fixing broken tests