Some refactoring of SclZfCart\Storage\CartStorage + fixed unit tests