diff --git a/app/src/main/java/sudoku/MutableCell.java b/app/src/main/java/sudoku/MutableCell.java
index 0270564..9673b8a 100644
--- a/app/src/main/java/sudoku/MutableCell.java
+++ b/app/src/main/java/sudoku/MutableCell.java
@@ -17,11 +17,6 @@ public class MutableCell extends Cell{
 		this.possibleSymbols = new ArrayList<>();
 	}
 
-	public MutableCell(MutableCell currentCell) {
-		super(currentCell);
-		this.possibleSymbols = currentCell.getPossibleSymbols();
-	}
-
 	public void setSymbolIndex(int symbolIndex) {
 		this.symbolIndex = symbolIndex;
 	}
diff --git a/app/src/main/java/sudoku/SudokuFactory.java b/app/src/main/java/sudoku/SudokuFactory.java
index d6ca071..61c4887 100644
--- a/app/src/main/java/sudoku/SudokuFactory.java
+++ b/app/src/main/java/sudoku/SudokuFactory.java
@@ -29,9 +29,10 @@ public class SudokuFactory {
 				for (int x = 0; x < width; x++) {
 					int index = ((y + blockY * height) * size + (x + blockX * width));
 					Cell blockCell = cells.get(index);
-					List<Block> blockContainers = new ArrayList<>();
-					blockContainers.add(newBlock);
-					blockCell.setBlockContainers(blockContainers);
+					blockCell.setBlock(newBlock);
+					// List<Block> blockContainers = new ArrayList<>();
+					// blockContainers.add(newBlock);
+					// blockCell.setBlockContainers(blockContainers);
 					newBlock.addCell(blockCell);
 				}
 			}
diff --git a/app/src/main/java/sudoku/solver/Solver.java b/app/src/main/java/sudoku/solver/Solver.java
index 63bc00a..e338437 100644
--- a/app/src/main/java/sudoku/solver/Solver.java
+++ b/app/src/main/java/sudoku/solver/Solver.java
@@ -31,7 +31,7 @@ public class Solver {
 
             int symbol = currentCell.getPossibleSymbols().get(0);
             currentCell.setSymbolIndex(symbol);
-            stack.push(new MutableCell(currentCell));
+            // stack.push(new MutableCell(currentCell));
             try {
                 doku.updateSymbolsPossibilities();
             } catch (Exception e) {
diff --git a/app/src/test/java/sudoku/SudokuSerializerTest.java b/app/src/test/java/sudoku/SudokuSerializerTest.java
index fdd68c1..f4a2d98 100644
--- a/app/src/test/java/sudoku/SudokuSerializerTest.java
+++ b/app/src/test/java/sudoku/SudokuSerializerTest.java
@@ -2,6 +2,8 @@ package sudoku;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.Random;
+
 import org.junit.jupiter.api.Test;
 
 import sudoku.io.SudokuPrinter;
@@ -19,9 +21,13 @@ public class SudokuSerializerTest {
 
     @Test
     void testSerialize() {
-        int blockWidth = 3;
-        int blockHeight = 3;
-        testSerializeWithSize(blockWidth, blockHeight);
+        int testCount = 5;
+        Random r = new Random();
+        for (int i = 0; i < testCount; i++) {
+            int blockWidth = r.nextInt(20) + 1;
+            int blockHeight = r.nextInt(20) + 1;
+            testSerializeWithSize(blockWidth, blockHeight);
+        }
     }
 
 }