Get tests working for running against staging