diff --git a/lambda-test/adc-test.c b/lambda-test/adc-test.c
index e8951b8..d045816 100644
--- a/lambda-test/adc-test.c
+++ b/lambda-test/adc-test.c
@@ -38,9 +38,9 @@
 
 	// enable pull-up resistor so the measured voltage
 	// should be close to AREF
-	PORTC |= (1 << PC1);
+	PORTC |= (1 << PC0);
 
-	uint16_t mV = getVoltage(PC1);
+	uint16_t mV = getVoltage(PC0);
 
 	return mV > 4900;
 }
diff --git a/lambda-test/display-test.c b/lambda-test/display-test.c
index fe4c77c..e984fa6 100644
--- a/lambda-test/display-test.c
+++ b/lambda-test/display-test.c
@@ -22,6 +22,7 @@
 	extern uint8_t beepCount;
 	extern uint16_t beepLength;
 
+	cancelAlert(true);
 	updatePending = false;
 
 	assertTrue(position == 0);
@@ -37,6 +38,9 @@
 	assertTrue(position == 2);
 
 	cycleDisplay();
+	assertTrue(position == 3);
+
+	cycleDisplay();
 	assertTrue(position == 0);
 
 	return true;
@@ -70,29 +74,31 @@
 	// initial measurements
 	assertTrue(measLatest.tempI == 0);
 	assertTrue(measLatest.tempO == 0);
-	assertTrue(measLatest.lambda == 0);
+	assertTrue(measLatest.lambda == 2000);
+	assertTrue(measLatest.current == 0);
 	// initial max measurements
 	assertTrue(measMax.tempI == 0);
 	assertTrue(measMax.tempO == 0);
 	assertTrue(measMax.lambda == 2000);
 
-	Measurement meas1 = {1, 2, 3};
+	Measurement meas1 = {1, 2, 3, 4};
 	updateMeas(meas1);
 	// updated measurements
 	assertTrue(measLatest.tempI == 1);
 	assertTrue(measLatest.tempO == 2);
 	assertTrue(measLatest.lambda == 3);
+	assertTrue(measLatest.current == 4);
 	// updated max measurements
 	assertTrue(measMax.tempI == 1);
 	assertTrue(measMax.tempO == 2);
 	assertTrue(measMax.lambda == 3);
 	assertTrue(updatePending);
 
-	Measurement meas2 = {0, 0, 10};
+	Measurement meas2 = {10, 20, 30, 40};
 	updateMeas(meas2);
 	// updated max measurements
-	assertTrue(measMax.tempI == 1);
-	assertTrue(measMax.tempO == 2);
+	assertTrue(measMax.tempI == 10);
+	assertTrue(measMax.tempO == 20);
 	assertTrue(measMax.lambda == 3);
 
 	return true;
diff --git a/lambda-test/rules-test.c b/lambda-test/rules-test.c
index a17d589..8d67a7c 100644
--- a/lambda-test/rules-test.c
+++ b/lambda-test/rules-test.c
@@ -146,6 +146,8 @@
 	Measurement meas = {0, 0, 0};
 	dir = 0;
 
+	setHeatingState(HEATING_READY);
+
 	meas.tempI = 99;
 	meas.lambda = 2000;
 	resetRules();
diff --git a/lambda-test/sensors-test.c b/lambda-test/sensors-test.c
index cc5bd35..736a59c 100644
--- a/lambda-test/sensors-test.c
+++ b/lambda-test/sensors-test.c
@@ -31,7 +31,8 @@
 
 	// enable pull-up resistor so the measured voltage
 	// should be close to AREF
-	PORTC |= ((1 << ADC_TEMPI) | (1 << ADC_TEMPO) | (1 << ADC_LAMBDA));
+	PORTC |= ((1 << ADC_TEMPI) | (1 << ADC_TEMPO) | (1 << ADC_LAMBDA) |
+			(1 << ADC_HEATING));
 
 	// do many measurements so the averaged voltages are near the measured
 	// voltages (close to AREF)
@@ -40,22 +41,24 @@
 		meas = measure();
 	}
 
-	// verify that temperatures and lambda are calculated correctly
+	// verify that temperatures, lambda and current are calculated correctly
 	// for voltages > 4900 and <= 5000 mV
 	assertTrue(meas.tempI >= 980 && meas.tempI <= 1000);
 	assertTrue(meas.tempO == 400);
 	assertTrue(meas.lambda >= 995 && meas.lambda <= 999);
+	assertTrue(meas.current >= 49000 && meas.current <= 50000);
 
 	return true;
 }
 
 bool testReadMeas(void) {
-	char* fields[] = {"1", "2", "3"};
+	char* fields[] = {"1", "2", "3", "4"};
 
-	Measurement meas = readMeas(fields, 3);
+	Measurement meas = readMeas(fields, 4);
 	assertTrue(meas.tempI == 1);
 	assertTrue(meas.tempO == 2);
 	assertTrue(meas.lambda == 3);
+	assertTrue(meas.current == 4);
 
 	return true;
 }
@@ -67,6 +70,7 @@
 	assertTrue(meas.tempI == 0);
 	assertTrue(meas.tempO == 0);
 	assertTrue(meas.lambda == 0);
+	assertTrue(meas.current == 0);
 
 	return true;
 }