#60 updated scenarios, renamed TextValidator, completed DictionaryValidator