Fix storage_data hardcoded id values

and add a test to check this stays accurate, so that these objects can
pass throught the validate proxy storage, for example.