[Validator] improved unit tests.