Make more "server test friendly".
2 files changed