diff --git a/src/mds/apitest/mdstipc_api.c b/src/mds/apitest/mdstipc_api.c
index 4890a8f4f..0ad2b7d17 100644
--- a/src/mds/apitest/mdstipc_api.c
+++ b/src/mds/apitest/mdstipc_api.c
@@ -1716,12 +1716,29 @@ void tet_svc_subscr_VDEST_10()
 		printf("\nFail to change role\n");
 		FAIL = 1;
 	}
+	// [Lennart] NOTE: The comments below for this event handling is
+	// applicable for the others as well.
+	// This wait loop for events is used in many places and looks the same
+	// in all places. The only difference is the event waited for.
+	// Consider doing this in a function that takes in parameters to wait
+	// for the correct event. It can return a boolen, true for succcess
+	//
 	// Retrieving the events
+	// [Lennart] This comment is a bit misleading. Yes, we are retrieving
+	// events but what we are actually doing here is to wait for an
+	// NCSMDS_UP event (and it is obvious events has to be retrieved in
+	// order detect the NCSMDS_UP event). SO the comment above is not
+	// informative. Should be something like:
+	// "Wait max 10 seconds for a NCSMDS_UP event" and why not rename
+	// kWaitTime to something like kWait10sec and timeout_time to wait_time.
+	// If you do that renaming the "max 10 seconds" part in the comment may
+	// be omitted
 	osaf_set_millis_timeout(kWaitTime, &timeout_time);
 	while (!osaf_is_timeout(&timeout_time)) {
 		osaf_nanosleep(&kHundredMilliseconds);
 		if (mds_service_retrieve(gl_tet_adest.mds_pwe1_hdl, 500,
 					 SA_DISPATCH_ALL) != NCSCC_RC_SUCCESS) {
+			// [Lennart] service misspelled here?
 			printf("\nRetrieve servive 500 Fail\n");
 			FAIL = 1;
 			break;
@@ -1736,8 +1753,18 @@ void tet_svc_subscr_VDEST_10()
 			break;
 		}
 	}
+	// [Lennart] is it correct to use events (plural) here? I think one
+	// NCSMDS_UP event will break the loop (but I am maybe wrong)
 	// The NCSMDS_UP events were not received within reasonable time.
 	if (osaf_is_timeout(&timeout_time)) {
+		// [Lennart] Note that you will get here also if the wanted
+		// NCSMDS_UP is found. It may be the case that the retrieve is
+		// done just before the timeout and that the timeout time is
+		// just passed when breaking the loop. Some check if the
+		// NCSMDS_UP is found should also be done.
+		// Example:
+		// if (osaf_is_timeout(&timeout_time) &&
+		//     <NCSMDS_UP is not found>)
 		printf("\nFail to verify svc_pvt_ver of UP events\n");
 		FAIL = 1;
 	}