fixed failing validator tests