Multifield form fixes and tests