Nightly checkin - Updates for tests against ref server