Fixed up some tests given the new cookie encoding/decoding - these tests were not present in the 2.1.x branch, or perhaps are elsewhere.