WIP.  Correct bugs in old form tests.