Geode: Updates for AcceptanceTest