Tests and changes for adding ability to specify smartstore database name,

Didn't do much for the Upgrader - doesn't seem like there is anything to do.
This looks good to me overall. Let's just change the string name to 2.3 here.