Added custom validator and test