Fix form helper tests