Update the form and tests
Update RTD documentation as well