Add test for clustering/storage