[WIP] Convert more form spec to tests