Fixing a couple screwups in refactoring and getting ZoneOperationApiLiveTest going.