Clean up Selection updates for dstore
Make test data modular and fix unit tests
Fix OnDemandList error in Firefox