Refactored BaseHandler and server and created initial testing