Single Dispatcher Instance for Server
Fixed failing client test