Add tests for deprecated forms