diff --git a/kernel/tests.c b/kernel/tests.c
index c5b96a61..27ab3942 100644
--- a/kernel/tests.c
+++ b/kernel/tests.c
@@ -120,7 +120,7 @@ static int mail_noise(void*arg) {
 
 #define N	1024
 //#define N 	514
-//#define LAZY
+#define LAZY
 
 volatile static int* A[N];
 volatile static int* B[N];
@@ -137,6 +137,7 @@ static int svm_test(void *arg)
 	uint64_t start, end;
 	uint32_t i, j, k;
 	int my_ue, num_ues;
+	register int tmp;
 
 	RCCE_barrier(&RCCE_COMM_WORLD);
 	my_ue = RCCE_ue();
@@ -167,10 +168,14 @@ static int svm_test(void *arg)
 		start = rdtsc();
 
 		// start calculation
-		for(i=0; i<N; i++)
-			for(j=0; j<N; j++)
+		for(i=0; i<N; i++) {
+			for(j=0; j<N; j++) {
+				tmp = C[i][j];
 				for(k=0; k<N; k++)
 					C[i][j] += A[i][k] * GET_B(k,j);
+				C[i][j] = tmp;
+			}
+		}
 
 
 		end = rdtsc();
@@ -218,10 +223,14 @@ static int svm_test(void *arg)
 	RCCE_barrier(&RCCE_COMM_WORLD);
 
 	// start calculation
-	for(i=my_ue*(N/num_ues); i<(my_ue+1)*(N/num_ues); i++)
-		for(j=0; j<N; j++)
+	for(i=my_ue*(N/num_ues); i<(my_ue+1)*(N/num_ues); i++) {
+		for(j=0; j<N; j++) {
+			tmp = C[i][j];
 			for(k=0; k<N; k++)
-				C[i][j] += A[i][k] * GET_B(k,j);
+				tmp += A[i][k] * GET_B(k,j);
+			C[i][j] = tmp;
+		}
+	}
 
 	svm_flush();
 
@@ -416,15 +425,15 @@ int test_init(void)
 //		create_kernel_task(NULL,client_task,NULL);
 #endif
 
-	create_kernel_task(NULL, foo, "Hello from foo1", NORMAL_PRIO);
-	create_kernel_task(NULL, join_test, NULL, NORMAL_PRIO);
+	//create_kernel_task(NULL, foo, "Hello from foo1", NORMAL_PRIO);
+	//create_kernel_task(NULL, join_test, NULL, NORMAL_PRIO);
 	//create_kernel_task(NULL, producer, , NORMAL_PRIO);
 	//create_kernel_task(NULL, consumer, NULL, NORMAL_PRIO);
 	//create_kernel_task(NULL, mail_ping, NULL, NORMAL_PRIO);
 	//create_kernel_task(NULL, mail_noise, NULL, NORMAL_PRIO);
-	//create_kernel_task(NULL, svm_test, NULL, NORMAL_PRIO);
+	create_kernel_task(NULL, svm_test, NULL, NORMAL_PRIO);
 	//create_user_task(NULL, "/bin/hello", argv);
-	create_user_task(NULL, "/bin/tests", argv);
+	//create_user_task(NULL, "/bin/tests", argv);
 	//create_user_task(NULL, "/bin/jacobi", argv);
 	//create_user_task(NULL, "/bin/jacobi", argv);
 	//create_user_task(NULL, "/bin/server", server_argv);