- Change code to use the datastore
- Change unit-test to cope with the code changes