Fix naming issues with TestMenuTest and TestMenuItemTest.

Closes #1169.