diff --git a/samples/runner/emugpubuilder.go b/samples/runner/emugpubuilder.go
index adfb3ab2..4adee0ff 100644
--- a/samples/runner/emugpubuilder.go
+++ b/samples/runner/emugpubuilder.go
@@ -155,11 +155,13 @@ func (b *EmuGPUBuilder) buildComputeUnits() {
 }
 
 func (b *EmuGPUBuilder) buildMemory() {
-	b.gpuMem = idealmemcontroller.New(
-		b.gpuName+".GlobalMem", b.engine, b.memCapacity)
-	b.gpuMem.Freq = 1 * sim.GHz
-	b.gpuMem.Latency = 1
-	b.gpuMem.Storage = b.storage
+	b.gpuMem = idealmemcontroller.
+		MakeBuilder().
+		WithStorage(b.storage).
+		WithEngine(b.engine).
+		WithFreq(1 * sim.GHz).
+		WithLatency(1).
+		Build(b.gpuName + ".GlobalMem")
 
 	if b.enableMemTracing {
 		file, _ := os.Create("mem.trace")
diff --git a/tests/deterministic/test.py b/tests/deterministic/test.py
index 580a933a..6bd32214 100644
--- a/tests/deterministic/test.py
+++ b/tests/deterministic/test.py
@@ -10,7 +10,7 @@
     TestCase("empty_kernel", "empty_kernel", ""),
     TestCase("memcopy", "memcopy", ""),
     TestCase("../../samples/fir", "fir", "-length=64"),
-    TestCase("../../samples/fir", "fir", "-length=65536"),
+    # TestCase("../../samples/fir", "fir", "-length=65536"),
 ]