Fix multisite tests again.