Rename parameters for clarity
Fix encoding test
Fix EncodedDiff parameter order
Fix sizes affected by encoding