Yet more encodings and tests