diff --git a/samples/src/Samples/SelectSample.tsx b/samples/src/Samples/SelectSample.tsx
index 3d09c1c..5e9a2ff 100644
--- a/samples/src/Samples/SelectSample.tsx
+++ b/samples/src/Samples/SelectSample.tsx
@@ -56,7 +56,6 @@ export function view(dispatch: Dispatcher<Msg>, model: Model) {
       <select
         value={value}
         onChange={(e) => {
-          console.log('FW onChange', e.target.value);
           dispatch({ type: 'selected', value: e.target.value });
         }}
       >
diff --git a/tea-cup/src/TeaCup/Program.test.tsx b/tea-cup/src/TeaCup/Program.test.tsx
index a1269d8..83b87ad 100644
--- a/tea-cup/src/TeaCup/Program.test.tsx
+++ b/tea-cup/src/TeaCup/Program.test.tsx
@@ -1,7 +1,8 @@
 import { describe, expect, test } from 'vitest';
-import { Cmd, Dispatcher, Maybe, noCmd, nothing, Result, Sub, Task } from 'tea-cup-fp';
-import { Program, updateUntilIdle } from 'react-tea-cup';
-import { render } from '@testing-library/react';
+import { Cmd, Dispatcher, just, Maybe, noCmd, nothing, Result, Sub, Task } from 'tea-cup-fp';
+import { Program } from './Program';
+import { updateUntilCondition, updateUntilIdle } from './Testing';
+import { render, RenderResult } from '@testing-library/react';
 import * as React from 'react';
 
 interface Model {
@@ -110,4 +111,15 @@ describe('program test', () => {
         done();
       }, 3000);
     }));
+
+  test('update until condition', () => {
+    return updateUntilCondition(
+      { init: init, view: (_d, model) => view(model), update: update, subscriptions: subscriptions },
+      (node) => render(node),
+      (model) => model.other,
+    ).then(([model, { container }]) => {
+      expect(model).toEqual({ id: just('myid'), other: true });
+      expect(container.querySelector('#myid')?.textContent).toEqual('myid,true');
+    });
+  });
 });
diff --git a/tea-cup/src/TeaCup/Testing.ts b/tea-cup/src/TeaCup/Testing.tsx
similarity index 56%
rename from tea-cup/src/TeaCup/Testing.ts
rename to tea-cup/src/TeaCup/Testing.tsx
index fa69c9b..28c350f 100644
--- a/tea-cup/src/TeaCup/Testing.ts
+++ b/tea-cup/src/TeaCup/Testing.tsx
@@ -23,7 +23,10 @@
  *
  */
 
-import { Dispatcher, Cmd } from 'tea-cup-fp';
+import { Dispatcher, Cmd, Sub, Maybe, nothing, just } from 'tea-cup-fp';
+import { ReactElement } from 'react';
+import { ProgramProps, Program, DispatchBridge } from './Program';
+import * as React from 'react';
 
 export class Testing<M> {
   private _dispatched: M | undefined;
@@ -44,7 +47,7 @@ export class Testing<M> {
   }
 
   public dispatchFrom(cmd: Cmd<M>): Promise<M> {
-    return new Promise<M>((resolve) => {
+    return new Promise<M>((resolve, reject) => {
       const dispatchedMsg = (msg: M) => {
         resolve(msg);
       };
@@ -52,3 +55,40 @@ export class Testing<M> {
     });
   }
 }
+
+type RenderFun<Model, Msg, T> = (node: ReactElement<ProgramProps<Model, Msg>>) => T;
+type Condition<Model, T> = (m: Model, t: T) => boolean;
+
+export function updateUntilCondition<Model, Msg, T>(
+  props: ProgramProps<Model, Msg>,
+  render: RenderFun<Model, Msg, T>,
+  condition: Condition<Model, T>,
+): Promise<[Model, T]> {
+  return new Promise((resolve) => {
+    let wrapper: Maybe<T> = nothing;
+    wrapper = just(
+      render(
+        <Program
+          init={props.init}
+          view={(d, model) => {
+            const r = props.view(d, model);
+            switch (wrapper.type) {
+              case 'Just': {
+                if (condition(model, wrapper.value)) {
+                  resolve([model, wrapper.value]);
+                }
+                break;
+              }
+              default: {
+                break;
+              }
+            }
+            return r;
+          }}
+          update={props.update}
+          subscriptions={props.subscriptions}
+        />,
+      ),
+    );
+  });
+}