Revert "Revert "rename multi2 to multi2+test""

This reverts commit bfee1c5df61f0237432d040400417f34655fab48.