diff --git a/calculator/test.js b/calculator/test.js
index 4d31fbf..e8e7212 100644
--- a/calculator/test.js
+++ b/calculator/test.js
@@ -53,20 +53,19 @@ global.Bangle = {
 // Mock 'load' (to exit app)
 global.load = () => {};
 
-// Mock 'require' for fonts
-const originalRequire = require;
-global.require = (name) => {
-  if (name === "FontDylex7x13") {
-    return { add: () => {} };
-  }
-  return originalRequire(name);
-};
 // --- End Mock ---
 
 
 // --- Load calculator app ---
 const calculatorCode = fs.readFileSync(path.join(__dirname, 'calculator.app.js'), 'utf8');
-eval(calculatorCode);
+(function(require) {
+  eval(calculatorCode);
+})((name) => {
+  if (name === "FontDylex7x13") {
+    return { add: () => {} };
+  }
+  return require(name);
+});
 // --- End Load ---