reordeing of Value fields according tro expected usage, all test pass
again.