modify validator
modify winnie and add test