diff --git a/gtsam_unstable/discrete/tests/testSudoku.cpp b/gtsam_unstable/discrete/tests/testSudoku.cpp
index 78f159251..4843ae269 100644
--- a/gtsam_unstable/discrete/tests/testSudoku.cpp
+++ b/gtsam_unstable/discrete/tests/testSudoku.cpp
@@ -107,9 +107,11 @@ class Sudoku : public CSP {
 
 /* ************************************************************************* */
 TEST_UNSAFE(Sudoku, small) {
-  Sudoku csp(4, 1, 0, 0, 4, 0, 0, 0, 0,
-
-             4, 0, 2, 0, 0, 1, 0, 0);
+  Sudoku csp(4,           //
+             1, 0, 0, 4,  //
+             0, 0, 0, 0,  //
+             4, 0, 2, 0,  //
+             0, 1, 0, 0);
 
   // Do BP
   csp.runArcConsistency(4, 10, PRINT);
@@ -128,14 +130,18 @@ TEST_UNSAFE(Sudoku, small) {
 
 /* ************************************************************************* */
 TEST_UNSAFE(Sudoku, easy) {
-  Sudoku sudoku(9, 0, 0, 5, 0, 9, 0, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 7, 3, 7, 6,
-                0, 0, 0, 8, 2, 0, 0,
+  Sudoku sudoku(9,                          //
+                0, 0, 5, 0, 9, 0, 0, 0, 1,  //
+                0, 0, 0, 0, 0, 2, 0, 7, 3,  //
+                7, 6, 0, 0, 0, 8, 2, 0, 0,  //
 
-                0, 1, 2, 0, 0, 9, 0, 0, 4, 0, 0, 0, 2, 0, 3, 0, 0, 0, 3, 0, 0,
-                1, 0, 0, 9, 6, 0,
+                0, 1, 2, 0, 0, 9, 0, 0, 4,  //
+                0, 0, 0, 2, 0, 3, 0, 0, 0,  //
+                3, 0, 0, 1, 0, 0, 9, 6, 0,  //
 
-                0, 0, 1, 9, 0, 0, 0, 5, 8, 9, 7, 0, 5, 0, 0, 0, 0, 0, 5, 0, 0,
-                0, 3, 0, 7, 0, 0);
+                0, 0, 1, 9, 0, 0, 0, 5, 8,  //
+                9, 7, 0, 5, 0, 0, 0, 0, 0,  //
+                5, 0, 0, 0, 3, 0, 7, 0, 0);
 
   // Do BP
   sudoku.runArcConsistency(4, 10, PRINT);
@@ -145,14 +151,15 @@ TEST_UNSAFE(Sudoku, easy) {
 
 /* ************************************************************************* */
 TEST_UNSAFE(Sudoku, extreme) {
-  Sudoku sudoku(9, 0, 0, 9, 7, 4, 8, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,
-                0, 1, 0, 9, 0, 0, 0,
-
-                0, 0, 7, 0, 0, 0, 2, 4, 0, 0, 6, 4, 0, 1, 0, 5, 9, 0, 0, 9, 8,
-                0, 0, 0, 3, 0, 0,
-
-                0, 0, 0, 8, 0, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
-                2, 7, 5, 9, 0, 0);
+  Sudoku sudoku(9,                             //
+                0, 0, 9, 7, 4, 8, 0, 0, 0, 7,  //
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 2,  //
+                0, 1, 0, 9, 0, 0, 0, 0, 0, 7,  //
+                0, 0, 0, 2, 4, 0, 0, 6, 4, 0,  //
+                1, 0, 5, 9, 0, 0, 9, 8, 0, 0,  //
+                0, 3, 0, 0, 0, 0, 0, 8, 0, 3,  //
+                0, 2, 0, 0, 0, 0, 0, 0, 0, 0,  //
+                0, 6, 0, 0, 0, 2, 7, 5, 9, 0, 0);
 
   // Do BP
   sudoku.runArcConsistency(9, 10, PRINT);
@@ -169,14 +176,18 @@ TEST_UNSAFE(Sudoku, extreme) {
 
 /* ************************************************************************* */
 TEST_UNSAFE(Sudoku, AJC_3star_Feb8_2012) {
-  Sudoku sudoku(9, 9, 5, 0, 0, 0, 6, 0, 0, 0, 0, 8, 4, 0, 7, 0, 0, 0, 0, 6, 2,
-                0, 5, 0, 0, 4, 0, 0,
+  Sudoku sudoku(9,                          //
+                9, 5, 0, 0, 0, 6, 0, 0, 0,  //
+                0, 8, 4, 0, 7, 0, 0, 0, 0,  //
+                6, 2, 0, 5, 0, 0, 4, 0, 0,  //
 
-                0, 0, 0, 2, 9, 0, 6, 0, 0, 0, 9, 0, 0, 0, 0, 0, 2, 0, 0, 0, 2,
-                0, 6, 3, 0, 0, 0,
+                0, 0, 0, 2, 9, 0, 6, 0, 0,  //
+                0, 9, 0, 0, 0, 0, 0, 2, 0,  //
+                0, 0, 2, 0, 6, 3, 0, 0, 0,  //
 
-                0, 0, 9, 0, 0, 7, 0, 6, 8, 0, 0, 0, 0, 3, 0, 2, 9, 0, 0, 0, 0,
-                1, 0, 0, 0, 3, 7);
+                0, 0, 9, 0, 0, 7, 0, 6, 8,  //
+                0, 0, 0, 0, 3, 0, 2, 9, 0,  //
+                0, 0, 0, 1, 0, 0, 0, 3, 7);
 
   // Do BP
   sudoku.runArcConsistency(9, 10, PRINT);