Some more modifications to AdaptiveScalarEncoder and DeltaEncoder along with test