Fix corner case in cvm updates, add test.

Fix wrong results that could end up with wrong shape.