Fix failing tests

[davisagli]

There are some known test failures:

• The captcha tests are still trying to use the old form block
• The email processor tests are making assertions about a Reply-To header that was removed