Little isue with storage_path generation fixed

* some unit tests added to cover this problem

Change-Id: I8aa3db443c9f4956bdb740b7d165bb5541a3e7fb
Merge "Little isue with storage_path generation fixed"