Buckets are now stored grouped by types
Tests updated
Further attempts to fix the file system read problem to no avail.