use a type-safe HSTORAGE struct
update and simplify tests