Changed menu and optimized test