Fixes and improvements to Server, Overlay

Tidying up some loose ends.
Those tests broke a long time ago when PeerFinder changed in development and I haven't had the time to fix them. They are quite complex. And they are even more broken now that PeerFinder doesn't use callbacks. The tests would just have to be rewritten from scratch. Although, it might be easier now without the callbacks.