Revert "rename multi2 to multi2+test"

This reverts commit fd95a0625b1a0e1bae12fd9042c0cca0195e8bfd.