Moved some old tests out of the way. Redesigned not display menu.