Add form validator and test