Add form tests and clean up test output.