diff --git a/packages/eval/evaluate.mjs b/packages/eval/evaluate.mjs
index b02f1aeb..e24ccf30 100644
--- a/packages/eval/evaluate.mjs
+++ b/packages/eval/evaluate.mjs
@@ -1,9 +1,12 @@
 import shapeshifter from './shapeshifter.mjs';
+import * as strudel from '@strudel/core';
+
+const { isPattern } = strudel;
 
 export const extend = (...args) => {
   // TODO: find a way to make args available to eval without adding it to global scope...
   // sadly, "with" does not work in strict mode
-  Object.assign(window, ...args);
+  Object.assign(globalThis, ...args);
 };
 
 export const evaluate = async (code) => {
diff --git a/packages/eval/test/evaluate.test.mjs b/packages/eval/test/evaluate.test.mjs
index 60432738..4bead9d5 100644
--- a/packages/eval/test/evaluate.test.mjs
+++ b/packages/eval/test/evaluate.test.mjs
@@ -1,9 +1,27 @@
-/* import { strict as assert } from 'assert';
-import evaluate from '../evaluate.mjs';
+import { strict as assert } from 'assert';
+import { evaluate, extend } from '../evaluate.mjs';
+import { mini } from '@strudel/mini';
+import * as strudel from '@strudel/core';
+
+const { cat } = strudel;
+
+extend({ mini }, strudel);
 
 describe('evaluate', () => {
-  it('Should evaluate simple double quote string', () => {
-    assert.deepStrictEqual(evaluate('"c3"'), pure('c3'));
+  const ev = async (code) => (await evaluate(code)).pattern._firstCycleValues;
+  it('Should evaluate strudel functions', async () => {
+    assert.deepStrictEqual(await ev("pure('c3')"), ['c3']);
+    assert.deepStrictEqual(await ev('cat(c3)'), ['c3']);
+    assert.deepStrictEqual(await ev('cat(c3, d3)'), ['c3', 'd3']);
+    assert.deepStrictEqual(await ev('slowcat(c3, d3)'), ['c3']);
+  });
+  it('Should be extendable', async () => {
+    extend({ myFunction: (...x) => cat(...x) });
+    assert.deepStrictEqual(await ev('myFunction(c3, d3)'), ['c3', 'd3']);
+  });
+  it('Should evaluate simple double quoted mini notation', async () => {
+    assert.deepStrictEqual(await ev('"c3"'), ['c3']);
+    assert.deepStrictEqual(await ev('"c3 d3"'), ['c3', 'd3']);
+    assert.deepStrictEqual(await ev('"<c3 d3>"'), ['c3']);
   });
 });
- */
\ No newline at end of file