added a fallback validator if there is no validator set
unit tests