Refactored Server class to be a singleton. Updated ServerTest class.