Update to run out-of-the-box against our sandbox