Add test to ensure that form fields survive round trip