Bring tests in line with commit 92c72ea19dd7a52022b190cc3723681e02e11f23

We changed the metadata structure, and broke tests by doing so.
This fixes that.