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.