[#1668] Faris : Fixing failing tests and using a custom validation method.