diff --git a/samples/lit.cfg.py b/samples/lit.cfg.py
index fb3d112..32dde48 100644
--- a/samples/lit.cfg.py
+++ b/samples/lit.cfg.py
@@ -24,7 +24,7 @@
     % (config.environment["ROOTDIR"], config.environment["OUT"]))
 renode_cmd = (
     "%s/sw/vec/scripts/test_runner.py"
-    " renode --renode-path %s/host/renode/renode.sh"
+    " renode --renode-path %s/host/renode/renode"
     % (config.environment["ROOTDIR"], config.environment["OUT"]))
 
 config.test_exec_root = config.environment["OUT"] + "/springbok_iree/tests"
diff --git a/samples/quant_model/CMakeLists.txt b/samples/quant_model/CMakeLists.txt
index 3d2a3b6..9675f1d 100644
--- a/samples/quant_model/CMakeLists.txt
+++ b/samples/quant_model/CMakeLists.txt
@@ -292,21 +292,21 @@
     "LINKER:--defsym=__stack_size__=100k"
 )
 
-#iree_cc_binary(
-#  NAME
-#    barcode_emitc_static
-#  SRCS
-#    "barcode.c"
-#  DEPS
-#    ::barcode_c_module_static_c
-#    ::barcode_c_module_static_emitc
-#    samples::util::util
-#  LINKOPTS
-#    "LINKER:--defsym=__itcm_length__=700k"
-#    "LINKER:--defsym=__stack_size__=100k"
-#  COPTS
-#    "-DBUILD_EMITC"
-#)
+iree_cc_binary(
+  NAME
+    barcode_emitc_static
+  SRCS
+    "barcode.c"
+  DEPS
+    ::barcode_c_module_static_c
+    ::barcode_c_module_static_emitc
+    samples::util::util
+  LINKOPTS
+    "LINKER:--defsym=__itcm_length__=700k"
+    "LINKER:--defsym=__stack_size__=100k"
+  COPTS
+    "-DBUILD_EMITC"
+)
 
 iree_cc_binary(
   NAME
@@ -351,20 +351,20 @@
     "LINKER:--defsym=__stack_size__=100k"
 )
 
-#iree_cc_binary(
-#  NAME
-#    fssd_25_8bit_v2_emitc_static
-#  SRCS
-#    "fssd_25_8bit_v2.c"
-#  DEPS
-#    ::fssd_25_8bit_v2_c_module_static_c
-#    ::fssd_25_8bit_v2_c_module_static_emitc
-#    samples::util::util
-#  LINKOPTS
-#    "LINKER:--defsym=__stack_size__=100k"
-#  COPTS
-#    "-DBUILD_EMITC"
-#)
+iree_cc_binary(
+  NAME
+    fssd_25_8bit_v2_emitc_static
+  SRCS
+    "fssd_25_8bit_v2.c"
+  DEPS
+    ::fssd_25_8bit_v2_c_module_static_c
+    ::fssd_25_8bit_v2_c_module_static_emitc
+    samples::util::util
+  LINKOPTS
+    "LINKER:--defsym=__stack_size__=100k"
+  COPTS
+    "-DBUILD_EMITC"
+)
 
 iree_cc_binary(
   NAME
@@ -409,20 +409,20 @@
     "LINKER:--defsym=__stack_size__=100k"
 )
 
-#iree_cc_binary(
-#  NAME
-#    semantic_lift_emitc_static
-#  SRCS
-#    "semantic_lift.c"
-#  DEPS
-#    ::semantic_lift_c_module_static_c
-#    ::semantic_lift_c_module_static_emitc
-#    samples::util::util
-#  LINKOPTS
-#    "LINKER:--defsym=__stack_size__=100k"
-#  COPTS
-#    "-DBUILD_EMITC"
-#)
+iree_cc_binary(
+  NAME
+    semantic_lift_emitc_static
+  SRCS
+    "semantic_lift.c"
+  DEPS
+    ::semantic_lift_c_module_static_c
+    ::semantic_lift_c_module_static_emitc
+    samples::util::util
+  LINKOPTS
+    "LINKER:--defsym=__stack_size__=100k"
+  COPTS
+    "-DBUILD_EMITC"
+)
 
 iree_cc_binary(
   NAME
diff --git a/samples/quant_model/barcode_test.txt b/samples/quant_model/barcode_test.txt
index 362a871..9557b0e 100644
--- a/samples/quant_model/barcode_test.txt
+++ b/samples/quant_model/barcode_test.txt
@@ -1,2 +1,3 @@
 // RUN: ${TEST_RUNNER_CMD} ${OUT}/springbok_iree/samples/quant_model/barcode_bytecode_static
+// RUN: ${TEST_RUNNER_CMD} ${OUT}/springbok_iree/samples/quant_model/barcode_emitc_static
 // REQUIRES: internal
diff --git a/samples/quant_model/fssd_test.txt b/samples/quant_model/fssd_test.txt
index ecad831..42f6a81 100644
--- a/samples/quant_model/fssd_test.txt
+++ b/samples/quant_model/fssd_test.txt
@@ -1,2 +1,3 @@
 // RUN: ${TEST_RUNNER_CMD} ${OUT}/springbok_iree/samples/quant_model/fssd_25_8bit_v2_bytecode_static
+// RUN: ${TEST_RUNNER_CMD} ${OUT}/springbok_iree/samples/quant_model/fssd_25_8bit_v2_emitc_static
 // REQUIRES: internal
diff --git a/samples/quant_model/mobilenet_v1_bytecode_static_test.txt b/samples/quant_model/mobilenet_v1_bytecode_static_test.txt
index 7393c88..4d2dda7 100644
--- a/samples/quant_model/mobilenet_v1_bytecode_static_test.txt
+++ b/samples/quant_model/mobilenet_v1_bytecode_static_test.txt
@@ -2,4 +2,3 @@
 // RUN: cat %t | FileCheck %s
 // TODO(hcindyl): Figure out ubuntu20.04 vs debian testing discrepancy.
 // CHECK: {{Image prediction result is: id: 17[5-8]}}
-// XFAIL: *
diff --git a/samples/quant_model/mobilenet_v1_emitc_static_test.txt b/samples/quant_model/mobilenet_v1_emitc_static_test.txt
index 54845c7..3d8dadb 100644
--- a/samples/quant_model/mobilenet_v1_emitc_static_test.txt
+++ b/samples/quant_model/mobilenet_v1_emitc_static_test.txt
@@ -2,4 +2,3 @@
 // RUN: cat %t | FileCheck %s
 // TODO(hcindyl): Figure out ubuntu20.04 vs debian testing discrepancy
 // CHECK: {{Image prediction result is: id: 17[5-8]}}
-// XFAIL: *
diff --git a/samples/quant_model/mobilenet_v2_bytecode_static_test.txt b/samples/quant_model/mobilenet_v2_bytecode_static_test.txt
index a1179ef..fd3b156 100644
--- a/samples/quant_model/mobilenet_v2_bytecode_static_test.txt
+++ b/samples/quant_model/mobilenet_v2_bytecode_static_test.txt
@@ -1,4 +1,3 @@
 // RUN: ${TEST_RUNNER_CMD} ${OUT}/springbok_iree/samples/quant_model/mobilenet_v2_bytecode_static 2>&1 | tee %t
 // RUN: cat %t | FileCheck %s
 // CHECK: {{Image prediction result is: id: 210}}
-// XFAIL: *
diff --git a/samples/quant_model/mobilenet_v2_emitc_static_text.txt b/samples/quant_model/mobilenet_v2_emitc_static_text.txt
index 668458d..1824224 100644
--- a/samples/quant_model/mobilenet_v2_emitc_static_text.txt
+++ b/samples/quant_model/mobilenet_v2_emitc_static_text.txt
@@ -1,4 +1,3 @@
 // RUN: ${TEST_RUNNER_CMD} ${OUT}/springbok_iree/samples/quant_model/mobilenet_v2_emitc_static 2>&1 | tee %t
 // RUN: cat %t | FileCheck %s
 // CHECK: {{Image prediction result is: id: 210}}
-// XFAIL: *
diff --git a/samples/quant_model/person_detection_bytecode_static_test.txt b/samples/quant_model/person_detection_bytecode_static_test.txt
index 31e94ef..f278d1d 100644
--- a/samples/quant_model/person_detection_bytecode_static_test.txt
+++ b/samples/quant_model/person_detection_bytecode_static_test.txt
@@ -1,4 +1,3 @@
 // RUN: ${TEST_RUNNER_CMD} ${OUT}/springbok_iree/samples/quant_model/person_detection_bytecode_static 2>&1 | tee %t
 // RUN: cat %t | FileCheck %s
 // CHECK: {{Non-person Score: -113; Person Score: 113}}
-// XFAIL: *
diff --git a/samples/quant_model/person_detection_emitc_static_test.txt b/samples/quant_model/person_detection_emitc_static_test.txt
index 28c8946..38b4bc4 100644
--- a/samples/quant_model/person_detection_emitc_static_test.txt
+++ b/samples/quant_model/person_detection_emitc_static_test.txt
@@ -1,4 +1,3 @@
 // RUN: ${TEST_RUNNER_CMD} ${OUT}/springbok_iree/samples/quant_model/person_detection_emitc_static 2>&1 | tee %t
 // RUN: cat %t | FileCheck %s
 // CHECK: {{Non-person Score: -113; Person Score: 113}}
-// XFAIL: *
diff --git a/samples/quant_model/semantic_lift_test.txt b/samples/quant_model/semantic_lift_test.txt
index ed9e0bc..38ccd4b 100644
--- a/samples/quant_model/semantic_lift_test.txt
+++ b/samples/quant_model/semantic_lift_test.txt
@@ -1,3 +1,3 @@
 // RUN: ${TEST_RUNNER_CMD} --timeout 200 ${OUT}/springbok_iree/samples/quant_model/semantic_lift_bytecode_static
+// RUN: ${TEST_RUNNER_CMD} --timeout 200 ${OUT}/springbok_iree/samples/quant_model/semantic_lift_emitc_static
 // REQUIRES: internal
-// XFAIL: *