Reverted FieldValidator to its previous state and correct test cases.