Rework some storage bits to try to make tests work; fix feature by fixing matching regex prefix