Cleanup, correct, and merge the formdata tests.