Multivalue tests all pass.
Rewrote lost code. Tests pass again.