Removing Dispatcher interface and replacing mock dispatcher with test server.