Modify validators and tests