Fix tests after ds enumeration fix

This makes the mocks actually represent the data format we're using rather than just strings.

After these changes all tests pass.