updating validator and tests