[us34608] reworked storage with params and test unit