Remove references to test servers