Updated Test Server implementation