modified Item, Store and test (still ugly as it can be)