Do some refactoring to reuse stuff in server tests, too