Remove unnecessary validator, add tests