update validator and add test