Updated validator factory and add validation service tests