Fix test reference data

Combination of a few different changes getting submitted around the same
time led to test reference data not being up-to-date with what the code
actually produced, without producing any conflicts.

Change-Id: I22f9a43faa3bd88668ba4c655d8d26f2a12089d1