Follow changes in server

This fixes the tests.