Cleanup, correct, and merge the formdata tests.
Merge pull request #610 from Ms2ger/formdata

Cleanup, correct, and merge the formdata tests.