Fix BundleStore tests