More form options, new test for test_forms
there were errors in prev commit