Storage Format implemented

Storage format is not used by the DumpClient and the tests have been
updated to reflect that
Extra indent.