Testing server fix