made storage return value tests a little more self-contained