fix validators, tests