add form validator + tests