Fixed tests to better reflect the encode/decode process