Coverage and small refactor on ValidatorFunctionMap