StoreableTests fixed