diff --git a/inc/Services/ParameterService.hpp b/inc/Services/ParameterService.hpp
index 19b3d89f487ac3a5af7ea8032f88d29ab0fff141..f214f7640b09edad829c2d4ecc584271842b2483 100644
--- a/inc/Services/ParameterService.hpp
+++ b/inc/Services/ParameterService.hpp
@@ -8,6 +8,11 @@
 
 // Number of stored parameters. MAX_PARAMS is just a dummy number for now.
 #define MAX_PARAMS 5
+// TODO: 1) Rework the parameter setting and report functions
+// TODO: 2) Implement flags and use them above
+// TODO: 3) Write more and better tests
+// TODO: 4) Make sure that docs are up to date
+// TODO: 5) Optimize stuff if possible
 
 /**
  * Implementation of the ST[20] parameter management service,
diff --git a/src/Services/ParameterService.cpp b/src/Services/ParameterService.cpp
index 86dbbcb1a48897ce7759ec9307bc0c96be80340f..c7dd119201d938163b980176835825cfbf405490 100644
--- a/src/Services/ParameterService.cpp
+++ b/src/Services/ParameterService.cpp
@@ -3,8 +3,8 @@
 
 ParameterService::ParameterService() {
 	// test addings
-	addNewParameter(3, 14);
-	addNewParameter(3, 14);
+//	addNewParameter(3, 14);
+//	addNewParameter(3, 14);
 }
 
 bool ParameterService::addNewParameter(uint8_t ptc, uint8_t pfc, uint32_t initialValue, UpdatePtr ptr) {
diff --git a/test/Services/ParameterService.cpp b/test/Services/ParameterService.cpp
index d21f32bd200f27e3334d9d40de88f945468a7edf..da2e5294b939046b52a1656064097a462203051c 100644
--- a/test/Services/ParameterService.cpp
+++ b/test/Services/ParameterService.cpp
@@ -5,7 +5,26 @@
 
 ParameterService& pserv = Services.parameterManagement;
 
+void foo(ValueType* bar) {  // sample function
+	*bar = 0xDEADBEEF;
+}
+
 TEST_CASE("Parameter Report Subservice") {
+
+	SECTION("Insertion test") {
+		pserv.addNewParameter(3, 14);  // this one has ID 0
+		pserv.addNewParameter(1, 7, 12);  // this one has 1
+		pserv.addNewParameter(4, 12, 3, nullptr);  // this one has 2
+		pserv.addNewParameter(12, 3, 6, &foo); // this one has 3
+	}
+
+	SECTION("ID checking") {
+		Message request(20, 1, Message::TC, 1);
+		Message report(20, 2, Message::TM, 1);
+
+		request.appendUint16(2)
+	}
+
 	SECTION("Faulty Instruction Handling Test") {
 		Message request(20, 1, Message::TC, 1);
 		Message report(20, 2, Message::TM, 1);