Fix bad constant reference.
Fix tests, update store.