More round-trip tests
More strict checking options
Encoder code cleanup