Fix device state store unit test

[daniellevass]

This test failed because it depended on the previous way of using the device state store test - we need to return a migrated device state store as well as the "old" device state store