Index: src/tests/preempt_longrun/stack.c
===================================================================
--- src/tests/preempt_longrun/stack.c	(revision 39f4100fa7aa26db6ccc1aaf3ad3cbd90205122f)
+++ src/tests/preempt_longrun/stack.c	(revision e50e9ffe2229beb9e49fa8bc4a148017190a43e0)
@@ -15,8 +15,8 @@
 
 void main(worker_t * this) {
-	volatile long p = 5_021_609ul;
-	volatile long a = 326_417ul;
-	volatile long n = 1l;
-	for (volatile long i = 0; i < p; i++) {
+	volatile long long p = 5_021_609ul;
+	volatile long long a = 326_417ul;
+	volatile long long n = 1l;
+	for (volatile long long i = 0; i < p; i++) {
 		n *= a;
 		n %= p;
Index: src/tests/sched-ext.c
===================================================================
--- src/tests/sched-ext.c	(revision e50e9ffe2229beb9e49fa8bc4a148017190a43e0)
+++ src/tests/sched-ext.c	(revision e50e9ffe2229beb9e49fa8bc4a148017190a43e0)
@@ -0,0 +1,72 @@
+#include <fstream>
+#include <kernel>
+#include <monitor>
+#include <stdlib>
+#include <thread>
+
+#include <time.h>
+
+static const unsigned long N = 2_500ul;
+
+#ifndef PREEMPTION_RATE
+#define PREEMPTION_RATE 10_000ul
+#endif
+
+unsigned int default_preemption() {
+	return PREEMPTION_RATE;
+}
+
+monitor global_t {};
+
+global_t globalA;
+
+thread Acceptor {};
+thread Acceptee {};
+
+//----------------------------------------------------------------------------------------------------
+// Acceptor
+void do_notify( global_t * mutex a );
+
+void do_wait( global_t * mutex a ) {
+	sout | "Preparing to wait" | endl;
+
+	__acceptable_t acceptable;
+	acceptable.func          = (void_fptr_t)do_notify;
+	acceptable.count         = 1;
+	acceptable.monitors      = &a;
+	acceptable.run_preaccept = false;
+
+	sout | "Waiting for notify" | endl;
+
+	int ret = __accept_internal( 1, &acceptable );
+	sout | "Back from wating, accepted" | ret | endl;
+}
+
+void main( Acceptor* this ) {
+	do_wait( &globalA );
+}
+
+//----------------------------------------------------------------------------------------------------
+// Acceptee
+void do_notify( global_t * mutex a ) {
+	sout | "Notifying" | endl;
+}
+
+void main( Acceptee* this ) {
+	for( volatile int i = 0; i < N; i++ );
+
+	sout | "Call Notify" | endl;
+	do_notify( &globalA );
+}
+
+//----------------------------------------------------------------------------------------------------
+// Main
+int main(int argc, char* argv[]) {
+	processor p;
+	sout | "Starting" | endl;
+	{
+		Acceptor r;
+		Acceptee e;
+	}
+	sout | "Done" | endl;
+}
Index: src/tests/sched-int-disjoint.c
===================================================================
--- src/tests/sched-int-disjoint.c	(revision 39f4100fa7aa26db6ccc1aaf3ad3cbd90205122f)
+++ src/tests/sched-int-disjoint.c	(revision e50e9ffe2229beb9e49fa8bc4a148017190a43e0)
@@ -3,4 +3,6 @@
 #include <monitor>
 #include <thread>
+
+#include <time.h>
 
 static const unsigned long N = 10_000ul;
@@ -107,4 +109,5 @@
 // Main loop
 int main(int argc, char* argv[]) {
+	rand48seed( time( NULL ) );
 	all_done = false;
 	processor p;
Index: src/tests/sched-int-wait.c
===================================================================
--- src/tests/sched-int-wait.c	(revision 39f4100fa7aa26db6ccc1aaf3ad3cbd90205122f)
+++ src/tests/sched-int-wait.c	(revision e50e9ffe2229beb9e49fa8bc4a148017190a43e0)
@@ -5,5 +5,7 @@
 #include <thread>
 
-static const unsigned long N = 10_000ul;
+#include <time.h>
+
+static const unsigned long N = 2_500ul;
 
 #ifndef PREEMPTION_RATE
@@ -119,4 +121,5 @@
 // Main
 int main(int argc, char* argv[]) {
+	rand48seed( time( NULL ) );
 	waiter_left = 4;
 	processor p[2];