some fixes to the implementation of ConfigurationStore, and additions/fixes to the unit tests for that code