Test loop menu selections until quit
Fix bugs in test for menu loop until quit
Loop main menu until user quits
Refactor methods in main app and test class