Fleshing out Server tests.  Refactored Server class to be more modular.