Fix unit tests to take multi-value pushes into account