fix tests & validator behaviour