Added more regression tests, and tweaked code to add more logging, and to
handle additional error cases.  This should help remove edge cases where
HiddenStores are not properly deleted on error.