Server: Make router public, remove some shims, fix junit warnings