issue #19469: got merge working
issue #19469: starting to rehab test as kind test
issue #19469: deep testing
issue #19469: got the tests back working
handle address fields widget
cleanup
issue #19469: thorough testing