add basic vhnd tests and fix an issue with multiple forms in the window
Merge pull request #4063 from dimagi/opm-cz

add basic vhnd tests and fix an issue with multiple forms in the window