Eliminate StoreTestKit; it made things harder rather than easier.