Reverting accidental rename of local vals in Int/Long codec tests