Fixed ValidatorBuilder
Improve Tests cover