Update tests for changes in adamwathan/form