More refactoring of fake server code