More encodings supported (and tests passing)