More UnitTests to test for Database create and load (using Zip import capabiliites)
Small refactoring on Server side cache load code