Merge "Better test for setStorageParams." into rvc-dev