diff --git a/openfpm_devices b/openfpm_devices
index 7c41af8f9c66acc49bf2e33a7aabfb320edc195d..cf2dbc0e76858853b76ea67a8c32dee6192501c2 160000
--- a/openfpm_devices
+++ b/openfpm_devices
@@ -1 +1 @@
-Subproject commit 7c41af8f9c66acc49bf2e33a7aabfb320edc195d
+Subproject commit cf2dbc0e76858853b76ea67a8c32dee6192501c2
diff --git a/src/Grid/tests/sgrid_dist_id_unit_tests.cpp b/src/Grid/tests/sgrid_dist_id_unit_tests.cpp
index c514975711e2b85b0fb8887b1f801e484757f82c..11e69670529126430ab8f58a7266809ccb60e3fc 100644
--- a/src/Grid/tests/sgrid_dist_id_unit_tests.cpp
+++ b/src/Grid/tests/sgrid_dist_id_unit_tests.cpp
@@ -161,8 +161,6 @@ BOOST_AUTO_TEST_CASE( sgrid_dist_id_basic_test_2D)
 		++it;
 	}
 
-	sg.write("sg_test_write");
-
 	bool match = true;
 	auto it2 = sg.getGridIterator();
 
@@ -697,6 +695,9 @@ BOOST_AUTO_TEST_CASE (sgrid_dist_id_soa_write )
 
 	auto & v_cl = create_vcluster<>();
 
+	if (v_cl.size() > 16)
+	{return;}
+
 	// Domain
 	Box<3,double> domain({-0.3,-0.3,-0.3},{1.0,1.0,1.0});