          (is (nil? (jruby-protocol/get-environment-class-info-tag
                     service
                     "production")))
-         (is (not (nil? production-before-first-update))))
+         (is (not (nil? production-cache-id-before-first-update))))
        (testing "when environment info first set to cache"
          (jruby-protocol/set-environment-class-info-tag!
           service
           "production"
           "1234prod"
-          production-before-first-update)
+          production-cache-id-before-first-update)
          (is (= "1234prod" (jruby-protocol/get-environment-class-info-tag
                             service
                             "production")))

             (is (nil? (jruby-protocol/get-environment-class-info-tag
                        service
                        "production")))
             (is (not= production-third-update
                       (jruby-protocol/get-environment-class-info-cache-generation-id!
                        service
                        "production")))
             (is (nil? (jruby-protocol/get-environment-class-info-tag service
                                                                      "test")))
             (is (not= test-first-update
                       (jruby-protocol/get-environment-class-info-cache-generation-id!
                        service
                        "test")))))
         (testing (str "when all environments expired between get and set "
                       "for environment that did not previously exist")
           (let [staging-before-marked-expired
                 (jruby-protocol/get-environment-class-info-cache-generation-id!
                  service
                  "staging")
                 _ (jruby-protocol/mark-all-environments-expired! service)
                 staging-after-marked-expired
                 (jruby-protocol/get-environment-class-info-cache-generation-id!
                  service
                  "staging")]

     default-services
     (jruby-service-test-config 1)
     (let [service (app/get-service app :JRubyPuppetService)
           production-cache-id-before-first-update
           (jruby-protocol/get-environment-class-info-cache-generation-id!
            service
            "production")]
