Refactor fake server request handling