Adding ability to specify FxA servers in Makefile.  refactoring test menu for simplicity