LAP-14 more storage unit tests