When using generated version output strings these produce stable but unusually ordered outputs. Fudge the tests to create the expected version strings to ease the update process. Change-Id: I021f2befe2422525f528e27b041f60ec684e1eae
6410265574