Index: src/tests/concurrent/examples/datingService.c
===================================================================
--- src/tests/concurrent/examples/datingService.c	(revision b2fe1c9d25e114799af78eb5b8a1aecb4313c62b)
+++ src/tests/concurrent/examples/datingService.c	(revision 32cab5b7850de1e6632f51e472d84eee06963594)
@@ -8,6 +8,6 @@
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jan  2 12:19:01 2018
-// Update Count     : 22
+// Last Modified On : Wed Mar 14 22:48:40 2018
+// Update Count     : 23
 //
 
@@ -88,6 +88,6 @@
 int main() {
 	DatingService TheExchange;
-	Girl *girls[NoOfPairs];
-	Boy  *boys[NoOfPairs];
+	Girl * girls[NoOfPairs];
+	Boy  * boys[NoOfPairs];
 
 	srandom( /*getpid()*/ 103 );
Index: src/tests/concurrent/preempt.c
===================================================================
--- src/tests/concurrent/preempt.c	(revision b2fe1c9d25e114799af78eb5b8a1aecb4313c62b)
+++ src/tests/concurrent/preempt.c	(revision 32cab5b7850de1e6632f51e472d84eee06963594)
@@ -1,10 +1,11 @@
 #include <kernel>
 #include <thread>
+#include <time>
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
 	return PREEMPTION_RATE;
 }
Index: src/tests/concurrent/signal/barge.c
===================================================================
--- src/tests/concurrent/signal/barge.c	(revision b2fe1c9d25e114799af78eb5b8a1aecb4313c62b)
+++ src/tests/concurrent/signal/barge.c	(revision 32cab5b7850de1e6632f51e472d84eee06963594)
@@ -16,8 +16,8 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
 	return 0;
 }
Index: src/tests/concurrent/signal/block.c
===================================================================
--- src/tests/concurrent/signal/block.c	(revision b2fe1c9d25e114799af78eb5b8a1aecb4313c62b)
+++ src/tests/concurrent/signal/block.c	(revision 32cab5b7850de1e6632f51e472d84eee06963594)
@@ -12,6 +12,5 @@
 #include <stdlib>
 #include <thread>
-
-#include <time.h>
+#include <time>
 
 #ifdef LONG_TEST
@@ -22,8 +21,8 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
 	return PREEMPTION_RATE;
 }
@@ -51,5 +50,5 @@
 //------------------------------------------------------------------------------
 void wait_op( global_data_t & mutex a, global_data_t & mutex b, unsigned i ) {
-	wait( cond, (uintptr_t)this_thread );
+    wait( cond, (uintptr_t)active_thread() );
 
 	yield( random( 10 ) );
@@ -60,5 +59,5 @@
 	}
 
-	a.last_thread = b.last_thread = this_thread;
+	a.last_thread = b.last_thread = active_thread();
 
 	yield( random( 10 ) );
@@ -76,5 +75,5 @@
 	yield( random( 10 ) );
 
-	[a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = this_thread;
+	[a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = active_thread();
 
 	if( !is_empty( cond ) ) {
@@ -106,5 +105,5 @@
 //------------------------------------------------------------------------------
 void barge_op( global_data_t & mutex a ) {
-	a.last_thread = this_thread;
+	a.last_thread = active_thread();
 }
 
Index: src/tests/concurrent/signal/disjoint.c
===================================================================
--- src/tests/concurrent/signal/disjoint.c	(revision b2fe1c9d25e114799af78eb5b8a1aecb4313c62b)
+++ src/tests/concurrent/signal/disjoint.c	(revision 32cab5b7850de1e6632f51e472d84eee06963594)
@@ -3,6 +3,5 @@
 #include <monitor>
 #include <thread>
-
-#include <time.h>
+#include <time>
 
 #ifdef LONG_TEST
@@ -13,8 +12,8 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
 	return PREEMPTION_RATE;
 }
Index: src/tests/concurrent/signal/wait.c
===================================================================
--- src/tests/concurrent/signal/wait.c	(revision b2fe1c9d25e114799af78eb5b8a1aecb4313c62b)
+++ src/tests/concurrent/signal/wait.c	(revision 32cab5b7850de1e6632f51e472d84eee06963594)
@@ -10,6 +10,5 @@
 #include <stdlib>
 #include <thread>
-
-#include <time.h>
+#include <time>
 
 #ifdef LONG_TEST
@@ -20,8 +19,8 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
 	return PREEMPTION_RATE;
 }
Index: src/tests/concurrent/waitfor/simple.c
===================================================================
--- src/tests/concurrent/waitfor/simple.c	(revision b2fe1c9d25e114799af78eb5b8a1aecb4313c62b)
+++ src/tests/concurrent/waitfor/simple.c	(revision 32cab5b7850de1e6632f51e472d84eee06963594)
@@ -10,8 +10,8 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
 	return PREEMPTION_RATE;
 }