diff --git a/src/systemcmds/tests/params.c b/src/systemcmds/tests/params.c
index 37d260e929de457fecfaef14a132347036bd3023..26adf3b905ad325aa9f73496d20386ee3acb32f3 100644
--- a/src/systemcmds/tests/params.c
+++ b/src/systemcmds/tests/params.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2017 PX4 Development Team. All rights reserved.
+ *   Copyright (C) 2017 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/systemcmds/tests/test_autodeclination.cpp b/src/systemcmds/tests/test_autodeclination.cpp
index 4f825d34055211787a22f987e160758b2ec42e5f..908af9c555f2dfa84e9cdf77d67f73cabbdc945f 100644
--- a/src/systemcmds/tests/test_autodeclination.cpp
+++ b/src/systemcmds/tests/test_autodeclination.cpp
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2016-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_autodeclination.cpp
+ * Test for autodeclination values.
+ */
+
 #include <unit_test.h>
 
 #include <drivers/drv_hrt.h>
diff --git a/src/systemcmds/tests/test_bezierQuad.cpp b/src/systemcmds/tests/test_bezierQuad.cpp
index 97fa80e186c5c00381537a3c09fe186ae0d693ab..9fc5f7f987bc308d2ed5aa6c24e52a19b255e5fd 100644
--- a/src/systemcmds/tests/test_bezierQuad.cpp
+++ b/src/systemcmds/tests/test_bezierQuad.cpp
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2018-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_bezierQuad.cpp
+ * Test for Bezier curve computation.
+ */
+
 #include <unit_test.h>
 #include <float.h>
 #include <stdlib.h>
diff --git a/src/systemcmds/tests/test_bson.cpp b/src/systemcmds/tests/test_bson.cpp
index de793cf8129fc1d3ca62d08d4b4bf52d53bb40ff..831c883b7506f63ac2f3b41846e2ea4b21a42866 100644
--- a/src/systemcmds/tests/test_bson.cpp
+++ b/src/systemcmds/tests/test_bson.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2018-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +32,7 @@
  ****************************************************************************/
 
 /**
- * @file tests_bson.c
- *
+ * @file test_bson.cpp
  * Tests for the bson en/decoder
  */
 
diff --git a/src/systemcmds/tests/test_controlmath.cpp b/src/systemcmds/tests/test_controlmath.cpp
index 169578bfb7fde73cbc813b0e0d45fb3bcd991676..8fc69f8a258fb74057ae3e28368af4c0ae80e1d3 100644
--- a/src/systemcmds/tests/test_controlmath.cpp
+++ b/src/systemcmds/tests/test_controlmath.cpp
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2018-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_controlmath.cpp
+ * Tests for the controls calculations.
+ */
+
 #include <unit_test.h>
 #include <mc_pos_control/Utility/ControlMath.hpp>
 #include <mathlib/mathlib.h>
diff --git a/src/systemcmds/tests/test_conv.cpp b/src/systemcmds/tests/test_conv.cpp
index 9a47a5aeae53e60c27ee1b1a67955a8706096118..5f26cd1cea28c2bfc4c143daad2ce84902d70a5f 100644
--- a/src/systemcmds/tests/test_conv.cpp
+++ b/src/systemcmds/tests/test_conv.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved.
+ *   Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,7 +34,6 @@
 /**
  * @file test_conv.cpp
  * Tests conversions used across the system.
- *
  */
 
 #include <sys/types.h>
diff --git a/src/systemcmds/tests/test_dataman.c b/src/systemcmds/tests/test_dataman.c
index a70f9af2560b5f248d5b3f09384a7d5a64d32652..3834020f1987b46962c8813963a58c388ca09cfe 100644
--- a/src/systemcmds/tests/test_dataman.c
+++ b/src/systemcmds/tests/test_dataman.c
@@ -1,7 +1,6 @@
 /****************************************************************************
- * px4/sensors/test_dataman.c
  *
- *  Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2018-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -13,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
+ * 3. Neither the name PX4 nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -32,9 +31,10 @@
  *
  ****************************************************************************/
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
+/**
+ * @file test_dataman.c
+ * Tests for the data manager.
+ */
 
 #include <px4_config.h>
 #include <px4_posix.h>
diff --git a/src/systemcmds/tests/test_file.c b/src/systemcmds/tests/test_file.c
index 6235afab7664482dcaa35574797afa1f1c18fba6..56838c6139d7e271ab40091d0bd0b8c44b96e4f1 100644
--- a/src/systemcmds/tests/test_file.c
+++ b/src/systemcmds/tests/test_file.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012-2014 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,9 +33,7 @@
 
 /**
  * @file test_file.c
- *
  * File write test.
- *
  * @author Lorenz Meier <lm@inf.ethz.ch>
  */
 
diff --git a/src/systemcmds/tests/test_file2.c b/src/systemcmds/tests/test_file2.c
index d1814a7913d5806d78a18352b57dffc10fe857c7..dad7096e1a40b5025d66739d7b87f82f74c3db8d 100644
--- a/src/systemcmds/tests/test_file2.c
+++ b/src/systemcmds/tests/test_file2.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,7 +33,6 @@
 
 /**
  * @file test_file2.c
- *
  * File write test.
  */
 
diff --git a/src/systemcmds/tests/test_float.cpp b/src/systemcmds/tests/test_float.cpp
index c066dbbb7e264842dc1b120fef8a0cacd998fc91..d9049ccd8335b590ce75f292f87285a7547c2432 100644
--- a/src/systemcmds/tests/test_float.cpp
+++ b/src/systemcmds/tests/test_float.cpp
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_float.cpp
+ * Tests for floating point arithmetic.
+ */
+
 #include <unit_test.h>
 
 #include <px4_config.h>
diff --git a/src/systemcmds/tests/test_hott_telemetry.c b/src/systemcmds/tests/test_hott_telemetry.c
index 5e863773c65cfae39194a0d8b9c90ea300cf420f..bb15a299c5c9421702081f36d0eea3bc07fe7c11 100644
--- a/src/systemcmds/tests/test_hott_telemetry.c
+++ b/src/systemcmds/tests/test_hott_telemetry.c
@@ -1,7 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
- *   Author: @author Simon Wilks <sjwilks@gmail.com>
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,15 +33,9 @@
 
 /**
  * @file test_hott_telemetry.c
- *
  * Tests the Graupner HoTT telemetry support.
- *
  */
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
 #include <px4_time.h>
 #include <px4_config.h>
 #include <px4_defines.h>
@@ -62,29 +55,6 @@
 #include "tests_main.h"
 
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
 static int open_uart(const char *device)
 {
 	/* baud rate */
@@ -121,14 +91,6 @@ static int open_uart(const char *device)
 	return uart;
 }
 
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: test_hott_telemetry
- ****************************************************************************/
-
 int test_hott_telemetry(int argc, char *argv[])
 {
 	PX4_INFO("HoTT Telemetry Test Requirements:");
diff --git a/src/systemcmds/tests/test_hrt.cpp b/src/systemcmds/tests/test_hrt.cpp
index e1711b3074e93fd0227cda4bea45330f4c6c76cf..2e2563b03bd0f7f876941eee694ff2f905d591e6 100644
--- a/src/systemcmds/tests/test_hrt.cpp
+++ b/src/systemcmds/tests/test_hrt.cpp
@@ -1,7 +1,6 @@
 /****************************************************************************
- * px4/sensors/test_hrt.c
  *
- *  Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -13,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
+ * 3. Neither the name PX4 nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -32,9 +31,10 @@
  *
  ****************************************************************************/
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
+/**
+ * @file test_hrt.c
+ * Tests the high resolution timer.
+ */
 
 #include <px4_config.h>
 #include <px4_posix.h>
@@ -55,34 +55,6 @@
 
 #include "tests_main.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
 
 extern uint16_t ppm_buffer[];
 extern unsigned ppm_decoded_channels;
@@ -175,10 +147,6 @@ out:
 	return 0;
 }
 
-/****************************************************************************
- * Name: test_hrt
- ****************************************************************************/
-
 int test_hrt(int argc, char *argv[])
 {
 	struct hrt_call call;
diff --git a/src/systemcmds/tests/test_hysteresis.cpp b/src/systemcmds/tests/test_hysteresis.cpp
index 1af3e5b9e568cca1d857f7a9f06ae365a6981778..4d4f2aae36f4ecc35834136bb2af27e29b4f1fca 100644
--- a/src/systemcmds/tests/test_hysteresis.cpp
+++ b/src/systemcmds/tests/test_hysteresis.cpp
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_hysteresis.cpp
+ * Tests for system timing hysteresis.
+ */
+
 #include <unit_test.h>
 #include <unistd.h>
 
diff --git a/src/systemcmds/tests/test_int.cpp b/src/systemcmds/tests/test_int.cpp
index f24a297dce6bd03ee1fa74e70625e75eb0251a08..bca7d709161a358979e0341da6a1e2930be3e839 100644
--- a/src/systemcmds/tests/test_int.cpp
+++ b/src/systemcmds/tests/test_int.cpp
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_int.cpp
+ * Tests for integer types.
+ */
+
 #include <unit_test.h>
 
 #include <errno.h>
diff --git a/src/systemcmds/tests/test_jig_voltages.c b/src/systemcmds/tests/test_jig_voltages.c
index 5282c646349b0cb2992b65632e0536dcff77c66c..80b386c3db36958a70544d284244cf2461cef2f2 100644
--- a/src/systemcmds/tests/test_jig_voltages.c
+++ b/src/systemcmds/tests/test_jig_voltages.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,9 +31,10 @@
  *
  ****************************************************************************/
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
+/**
+ * @file test_jig_voltages.c
+ * Tests for jig voltages.
+ */
 
 #include <px4_config.h>
 #include <px4_defines.h>
diff --git a/src/systemcmds/tests/test_led.c b/src/systemcmds/tests/test_led.c
index d17cd74d23c2066f889a50b7a8f86dad4e8e478d..4d4d1c9855770ca2f6fc927e4ea16fe94923f416 100644
--- a/src/systemcmds/tests/test_led.c
+++ b/src/systemcmds/tests/test_led.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *  Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
+ * 3. Neither the name PX4 nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,9 +31,10 @@
  *
  ****************************************************************************/
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
+/**
+ * @file test_led.c
+ * Tests for led functionality.
+ */
 
 #include <px4_time.h>
 #include <px4_config.h>
@@ -53,38 +54,6 @@
 
 #include "tests_main.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: test_led
- ****************************************************************************/
 
 int test_led(int argc, char *argv[])
 {
diff --git a/src/systemcmds/tests/test_mathlib.cpp b/src/systemcmds/tests/test_mathlib.cpp
index 5f3992c4f638ca762792517f089ae4269af49c45..599c9f7f3e7a07a91b13870ea970c1949ffe3f3a 100644
--- a/src/systemcmds/tests/test_mathlib.cpp
+++ b/src/systemcmds/tests/test_mathlib.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2013-2015 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2013-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,11 @@
  *
  ****************************************************************************/
 
+/**
+ * @file test_mathlib.cpp
+ * Tests for the PX4 math library.
+ */
+
 #include <unit_test.h>
 
 #include <errno.h>
diff --git a/src/systemcmds/tests/test_matrix.cpp b/src/systemcmds/tests/test_matrix.cpp
index f7523bcfaae13a33e59dec951a99a10dcf1cd0eb..af9ab4a6b4d6aa9e75b7ae3421ef3c1c8ddbba1c 100644
--- a/src/systemcmds/tests/test_matrix.cpp
+++ b/src/systemcmds/tests/test_matrix.cpp
@@ -1,3 +1,40 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2013-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_matrix.cpp
+ * Tests for the PX4 matrix math library.
+ */
 
 #include <unit_test.h>
 
diff --git a/src/systemcmds/tests/test_microbench_hrt.cpp b/src/systemcmds/tests/test_microbench_hrt.cpp
index 4eefe1f63ae4b5dceb36520289abe4db3d436696..40ed9243374f1a2d9b4a1f7acdef8232b8a10051 100644
--- a/src/systemcmds/tests/test_microbench_hrt.cpp
+++ b/src/systemcmds/tests/test_microbench_hrt.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2018 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2018-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,11 @@
  *
  ****************************************************************************/
 
+/**
+ * @file test_microbench_hrt.cpp
+ * Tests for the microbench high resolution timer.
+ */
+
 #include <unit_test.h>
 
 #include <time.h>
diff --git a/src/systemcmds/tests/test_microbench_math.cpp b/src/systemcmds/tests/test_microbench_math.cpp
index 6e005c94c8a360bc2c5bf950b73eb9664ed0c0df..329c77c1374da80c20e250a5fd663edb72a3e40e 100644
--- a/src/systemcmds/tests/test_microbench_math.cpp
+++ b/src/systemcmds/tests/test_microbench_math.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2018 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2018-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,11 @@
  *
  ****************************************************************************/
 
+/**
+ * @file test_microbench_math.cpp
+ * Tests for the microbench math library.
+ */
+
 #include <unit_test.h>
 
 #include <time.h>
diff --git a/src/systemcmds/tests/test_microbench_matrix.cpp b/src/systemcmds/tests/test_microbench_matrix.cpp
index b8b83a2ee6dd1b33b5eee7dc9d358adc972c5449..07969058f80e7703a8ad1779d86446ea843d4f19 100644
--- a/src/systemcmds/tests/test_microbench_matrix.cpp
+++ b/src/systemcmds/tests/test_microbench_matrix.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2018 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2018-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,11 @@
  *
  ****************************************************************************/
 
+/**
+ * @file test_microbench_matrix.cpp
+ * Tests for the microbench matrix math library.
+ */
+
 #include <unit_test.h>
 
 #include <time.h>
diff --git a/src/systemcmds/tests/test_microbench_uorb.cpp b/src/systemcmds/tests/test_microbench_uorb.cpp
index c1ac196daf9498cdf8213be107e3013e6bf7ed49..96da81dc94e304da0c1f75d99935425fbc9f49a7 100644
--- a/src/systemcmds/tests/test_microbench_uorb.cpp
+++ b/src/systemcmds/tests/test_microbench_uorb.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2018 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2018-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,11 @@
  *
  ****************************************************************************/
 
+/**
+ * @file test_microbench_uorb.cpp
+ * Tests for microbench uORB functionality.
+ */
+
 #include <unit_test.h>
 
 #include <time.h>
diff --git a/src/systemcmds/tests/test_mixer.cpp b/src/systemcmds/tests/test_mixer.cpp
index 7d0d3bd3e9e50a24fdf26b27a8e9a7e19721ae16..8c8db548df6e434d3f43afa64ff128639d63498d 100644
--- a/src/systemcmds/tests/test_mixer.cpp
+++ b/src/systemcmds/tests/test_mixer.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2013, 2017 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2013-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +32,7 @@
  ****************************************************************************/
 
 /**
- * @file test_mixer.hpp
- *
+ * @file test_mixer.cpp
  * Mixer load test
  */
 
diff --git a/src/systemcmds/tests/test_mount.c b/src/systemcmds/tests/test_mount.c
index 896c96144509d9248413ce4133266f4fef3d3d66..87d70c56cfa67f4b00e216aaf1d239ab79164852 100644
--- a/src/systemcmds/tests/test_mount.c
+++ b/src/systemcmds/tests/test_mount.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012-2014 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,9 +33,7 @@
 
 /**
  * @file test_mount.c
- *
  * Device mount / unmount stress test
- *
  * @author Lorenz Meier <lm@inf.ethz.ch>
  */
 
diff --git a/src/systemcmds/tests/test_param.c b/src/systemcmds/tests/test_param.c
index 466bea1cb90f79b1bebe641bb89679525daa4d58..726cb6aa96f5cf5117dcd9a01863fa3e19f3461f 100644
--- a/src/systemcmds/tests/test_param.c
+++ b/src/systemcmds/tests/test_param.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,7 +33,6 @@
 
 /**
  * @file test_param.c
- *
  * Tests related to the parameter system.
  */
 
diff --git a/src/systemcmds/tests/test_parameters.cpp b/src/systemcmds/tests/test_parameters.cpp
index 45cefe5414356948abfcb16d5fa24f96f3c2f3ce..3056ab0e2f092902263d0dc74b8ddb15e625abd0 100644
--- a/src/systemcmds/tests/test_parameters.cpp
+++ b/src/systemcmds/tests/test_parameters.cpp
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_parameters.cpp
+ * Tests related to the parameter system.
+ */
+
 #include <unit_test.h>
 
 #include <px4_defines.h>
diff --git a/src/systemcmds/tests/test_perf.c b/src/systemcmds/tests/test_perf.c
index 776397093a1b17eb41c4a8b4739a611007999b9e..f56f1ec051131627b4bc2dc330446e12679535da 100644
--- a/src/systemcmds/tests/test_perf.c
+++ b/src/systemcmds/tests/test_perf.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012-2014 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,11 @@
  *
  ****************************************************************************/
 
+/**
+ * @file test_perf.c
+ * Tests related to the performance counter.
+ */
+
 #include <px4_config.h>
 #include <px4_posix.h>
 
diff --git a/src/systemcmds/tests/test_ppm_loopback.c b/src/systemcmds/tests/test_ppm_loopback.c
index 10e264bfa418a2d8c9d413ca008f9fea6c0df96e..e1e6306b06688207cbd9917b3cf907249edbbfed 100644
--- a/src/systemcmds/tests/test_ppm_loopback.c
+++ b/src/systemcmds/tests/test_ppm_loopback.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012, 2013, 2017 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,7 +34,6 @@
 /**
  * @file test_ppm_loopback.c
  * Tests the PWM outputs and PPM input
- *
  */
 
 #include <px4_time.h>
diff --git a/src/systemcmds/tests/test_rc.c b/src/systemcmds/tests/test_rc.c
index d7f948442a84bc7b1133f0568997a86a75f9c492..88eb8fa9790b3bb28a8daafba6910ab4e2d541c7 100644
--- a/src/systemcmds/tests/test_rc.c
+++ b/src/systemcmds/tests/test_rc.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,7 +34,6 @@
 /**
  * @file test_rc.c
  * Tests RC input.
- *
  */
 
 #include <px4_config.h>
diff --git a/src/systemcmds/tests/test_search_min.cpp b/src/systemcmds/tests/test_search_min.cpp
index 111c8e875dfd923b3beb3cfc1642e92bad718eec..a9642e40ad0850849ebedf732fc2db9140c091d1 100644
--- a/src/systemcmds/tests/test_search_min.cpp
+++ b/src/systemcmds/tests/test_search_min.cpp
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_search_min.c
+ * Tests arithmetic search algorithms.
+ */
+
 #include <unit_test.h>
 #include <float.h>
 
diff --git a/src/systemcmds/tests/test_sensors.c b/src/systemcmds/tests/test_sensors.c
index 20fe551cb3b096a308e35fd08def6985f702a77c..09ed6edaf08edb25389ad0e8b139275973749e04 100644
--- a/src/systemcmds/tests/test_sensors.c
+++ b/src/systemcmds/tests/test_sensors.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,7 +34,6 @@
 /**
  * @file test_sensors.c
  * Tests the onboard sensors.
- *
  * @author Lorenz Meier <lm@inf.ethz.ch>
  */
 
diff --git a/src/systemcmds/tests/test_servo.c b/src/systemcmds/tests/test_servo.c
index 27f34967c91fecadec0e222bbd2c08ed67449a90..f1950397fe202fc0285c5b8c0e6bd25b637f67fc 100644
--- a/src/systemcmds/tests/test_servo.c
+++ b/src/systemcmds/tests/test_servo.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012, 2013, 2017 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,7 +34,6 @@
 /**
  * @file test_servo.c
  * Tests the servo outputs
- *
  */
 
 #include <px4_time.h>
diff --git a/src/systemcmds/tests/test_sleep.c b/src/systemcmds/tests/test_sleep.c
index addc7195d754ec47ab36b00ad5c060c837b5dc96..1e6af68614613e8a84f90bd93a9716808044c6c0 100644
--- a/src/systemcmds/tests/test_sleep.c
+++ b/src/systemcmds/tests/test_sleep.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *  Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
+ * 3. Neither the name PX4 nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,9 +31,10 @@
  *
  ****************************************************************************/
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
+/**
+ * @file test_sleep.c
+ * Tests the px4_usleep() method.
+ */
 
 #include <px4_time.h>
 #include <px4_config.h>
diff --git a/src/systemcmds/tests/test_smooth_z.cpp b/src/systemcmds/tests/test_smooth_z.cpp
index 3e90c2dfc0aed72b80f6515172a50d9f6868eb10..7a6d2de868c00b55257cf652c0ced285483a8483 100644
--- a/src/systemcmds/tests/test_smooth_z.cpp
+++ b/src/systemcmds/tests/test_smooth_z.cpp
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_smooth_z.cpp
+ * Tests flight path smoothing algorithms.
+ */
+
 #include <unit_test.h>
 #include <lib/FlightTasks/tasks/Utility/ManualSmoothingZ.hpp>
 #include <float.h>
diff --git a/src/systemcmds/tests/test_time.c b/src/systemcmds/tests/test_time.c
index c253ade44b92e9f5597d83266347cda628a6e29a..235abcf5f39f6f5b84b6b498579f15d966dbbbd6 100644
--- a/src/systemcmds/tests/test_time.c
+++ b/src/systemcmds/tests/test_time.c
@@ -1,7 +1,6 @@
 /****************************************************************************
- * px4/tests/test_time.c
  *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,9 +31,10 @@
  *
  ****************************************************************************/
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
+/**
+ * @file test_time.c
+ * Tests clocks/timekeeping.
+ */
 
 #include <px4_config.h>
 #include <px4_defines.h>
@@ -56,34 +56,10 @@
 #include <drivers/drv_hrt.h>
 
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/* emulate hrt_absolute_time using the cycle counter */
 static hrt_abstime
 cycletime(void)
 {
+	/* emulate hrt_absolute_time using the cycle counter */
 	static uint64_t basetime;
 	static uint32_t lasttime;
 	uint32_t cycles;
@@ -99,14 +75,6 @@ cycletime(void)
 	return (basetime + cycles) / 168;	/* XXX magic number */
 }
 
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: test_time
- ****************************************************************************/
-
 int test_time(int argc, char *argv[])
 {
 	hrt_abstime h, c;
diff --git a/src/systemcmds/tests/test_uart_baudchange.c b/src/systemcmds/tests/test_uart_baudchange.c
index 4e71fb25ec8269acfd258f0c822738f5f42721ed..e64bf5809b196b94bc4820c93b6f40359f3939db 100644
--- a/src/systemcmds/tests/test_uart_baudchange.c
+++ b/src/systemcmds/tests/test_uart_baudchange.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *  Copyright (c) 2012, 2017 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,7 +33,6 @@
 
 /**
  * @file test_uart_baudchange.c
- *
  * @author Lorenz Meier <lorenz@px4.io>
  */
 
diff --git a/src/systemcmds/tests/test_uart_break.c b/src/systemcmds/tests/test_uart_break.c
index b5c44a77f0be98d0e9fabd6d038f01ced728574d..213bab2135555a1b3496c4ba8ee57af47a120f6f 100644
--- a/src/systemcmds/tests/test_uart_break.c
+++ b/src/systemcmds/tests/test_uart_break.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *  Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,7 +33,6 @@
 
 /**
  * @file test_uart_break.c
- *
  * @author Lorenz Meier <lorenz@px4.io>
  * @author David Sidrane <david_s5@nscdg.com>
  */
diff --git a/src/systemcmds/tests/test_uart_console.c b/src/systemcmds/tests/test_uart_console.c
index d07e280270b715dd59a08ca0b392053d526ea36f..bd46bfb3711f6816a8e58db5590c119d6204ef7a 100644
--- a/src/systemcmds/tests/test_uart_console.c
+++ b/src/systemcmds/tests/test_uart_console.c
@@ -1,8 +1,6 @@
 /****************************************************************************
- * px4/sensors/test_uart_console.c
  *
- *   Copyright (C) 2012 Lorenz Meier. All rights reserved.
- *   Authors: Lorenz Meier <lm@inf.ethz.ch>
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -14,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
+ * 3. Neither the name PX4 nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,9 +31,13 @@
  *
  ****************************************************************************/
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
+/**
+ * @file test_uart_break.c
+ * Tests the uart console.
+ *
+ * @author Lorenz Meier <lorenz@px4.io>
+ * @author David Sidrane <david_s5@nscdg.com>
+ */
 
 #include <px4_config.h>
 #include <px4_tasks.h>
@@ -73,7 +75,6 @@ static void *receive_loop(void *arg)
 int test_uart_console(int argc, char *argv[])
 {
 	/* assuming NuttShell is on UART1 (/dev/ttyS0) */
-	//
 	int uart_usb = open("/dev/ttyACM0", O_WRONLY | O_NOCTTY);
 
 	if (uart_usb < 0) {
diff --git a/src/systemcmds/tests/test_uart_loopback.c b/src/systemcmds/tests/test_uart_loopback.c
index 6f97cebb79035225aa28a8bd56598213e5077f1e..b818cf1497d6121758bba27c311fa9b51cbcfa0c 100644
--- a/src/systemcmds/tests/test_uart_loopback.c
+++ b/src/systemcmds/tests/test_uart_loopback.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,7 +33,7 @@
 
 /**
  * @file test_uart_loopback.c
- * Tests the uart outputs
+ * Tests the uart outputs.
  *
  * @author Lorenz Meier <lorenz@px4.io>
  */
diff --git a/src/systemcmds/tests/test_uart_send.c b/src/systemcmds/tests/test_uart_send.c
index 6336834dabe3706402a6764d30607de543976556..5432d5a495c95ff819dbccaca2096acc127ae765 100644
--- a/src/systemcmds/tests/test_uart_send.c
+++ b/src/systemcmds/tests/test_uart_send.c
@@ -1,7 +1,6 @@
 /****************************************************************************
  *
- *  Copyright (C) 2012 PX4 Development Team. All rights reserved.
- *            Lorenz Meier <lm@inf.ethz.ch>
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -13,7 +12,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
+ * 3. Neither the name PX4 nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -32,9 +31,12 @@
  *
  ****************************************************************************/
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
+/**
+ * @file test_uart_send.c
+ * Tests the uart send functionality.
+ *
+ * @author Lorenz Meier <lorenz@px4.io>
+ */
 
 #include <px4_config.h>
 
@@ -55,39 +57,6 @@
 #include <drivers/drv_hrt.h>
 
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: test_led
- ****************************************************************************/
-
 int test_uart_send(int argc, char *argv[])
 {
 	/* input handling */
diff --git a/src/systemcmds/tests/test_versioning.cpp b/src/systemcmds/tests/test_versioning.cpp
index d37d113812034bdd342036937d9a06b9115a9ced..40da1e63b1b73ff5af55a1af2ac3526942061773 100644
--- a/src/systemcmds/tests/test_versioning.cpp
+++ b/src/systemcmds/tests/test_versioning.cpp
@@ -1,3 +1,41 @@
+/****************************************************************************
+ *
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file test_versioning.c
+ * Tests automatic versioning functionality.
+ */
+
 #include <unit_test.h>
 #include <version/version.h>
 
diff --git a/src/systemcmds/tests/tests_main.c b/src/systemcmds/tests/tests_main.c
index c5fed2ad817822e858025c281cd93518b8b65a5e..03f2e3ab93be757fc55ef1ede14843c5d8759879 100644
--- a/src/systemcmds/tests/tests_main.c
+++ b/src/systemcmds/tests/tests_main.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -50,11 +50,6 @@
 // Not using Eigen at the moment
 #define TESTS_EIGEN_DISABLE
 
-#include "tests_main.h"
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
 
 static int test_help(int argc, char *argv[]);
 static int test_runner(unsigned option);
@@ -62,10 +57,6 @@ static int test_runner(unsigned option);
 static int test_all(int argc, char *argv[]);
 static int test_jig(int argc, char *argv[]);
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 const struct {
 	const char 	*name;
 	int	(* fn)(int argc, char *argv[]);
diff --git a/src/systemcmds/tests/tests_main.h b/src/systemcmds/tests/tests_main.h
index 973d9f8e84d680a00580e30af4173ea55a161e6b..05b68a5c48277c77c5ea205bce0a54359bbf8329 100644
--- a/src/systemcmds/tests/tests_main.h
+++ b/src/systemcmds/tests/tests_main.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.
+ *  Copyright (C) 2012-2019 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,70 +31,61 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_PX4_TESTS_H
-#define __APPS_PX4_TESTS_H
-
 /**
  * @file tests_main.h
  * Tests declaration file.
- *
  */
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
 #include <px4_config.h>
 
-/****************************************************************************
- * Definitions
- ****************************************************************************/
+#ifndef __APPS_PX4_TESTS_H
+#define __APPS_PX4_TESTS_H
 
 __BEGIN_DECLS
 
-extern int	test_adc(int argc, char *argv[]);
-extern int	test_autodeclination(int argc, char *argv[]);
-extern int	test_hysteresis(int argc, char *argv[]);
-extern int	test_bezierQuad(int argc, char *argv[]);
-extern int	test_bson(int argc, char *argv[]);
-extern int	test_conv(int argc, char *argv[]);
-extern int	test_dataman(int argc, char *argv[]);
-extern int	test_file(int argc, char *argv[]);
-extern int	test_file2(int argc, char *argv[]);
-extern int	test_float(int argc, char *argv[]);
-extern int	test_hott_telemetry(int argc, char *argv[]);
-extern int	test_hrt(int argc, char *argv[]);
-extern int	test_int(int argc, char *argv[]);
-extern int	test_jig_voltages(int argc, char *argv[]);
-extern int	test_led(int argc, char *argv[]);
-extern int	test_mathlib(int argc, char *argv[]);
-extern int	test_matrix(int argc, char *argv[]);
-extern int	test_microbench_hrt(int argc, char *argv[]);
-extern int	test_microbench_math(int argc, char *argv[]);
-extern int	test_microbench_matrix(int argc, char *argv[]);
-extern int	test_microbench_uorb(int argc, char *argv[]);
-extern int	test_mixer(int argc, char *argv[]);
-extern int	test_mount(int argc, char *argv[]);
-extern int	test_param(int argc, char *argv[]);
-extern int	test_perf(int argc, char *argv[]);
-extern int	test_ppm(int argc, char *argv[]);
-extern int	test_ppm_loopback(int argc, char *argv[]);
-extern int	test_rc(int argc, char *argv[]);
-extern int	test_search_min(int argc, char *argv[]);
-extern int	test_sensors(int argc, char *argv[]);
-extern int	test_servo(int argc, char *argv[]);
-extern int	test_sleep(int argc, char *argv[]);
-extern int	test_time(int argc, char *argv[]);
-extern int	test_tone(int argc, char *argv[]);
-extern int	test_uart_baudchange(int argc, char *argv[]);
-extern int	test_uart_break(int argc, char *argv[]);
-extern int	test_uart_console(int argc, char *argv[]);
-extern int	test_uart_loopback(int argc, char *argv[]);
-extern int	test_uart_send(int argc, char *argv[]);
-extern int	test_parameters(int argc, char *argv[]);
-extern int	test_versioning(int argc, char *argv[]);
-extern int  test_smooth_z(int argc, char *argv[]);
-extern int 	test_controlmath(int argc, char *argv[]);
+extern int test_adc(int argc, char *argv[]);
+extern int test_autodeclination(int argc, char *argv[]);
+extern int test_hysteresis(int argc, char *argv[]);
+extern int test_bezierQuad(int argc, char *argv[]);
+extern int test_bson(int argc, char *argv[]);
+extern int test_conv(int argc, char *argv[]);
+extern int test_dataman(int argc, char *argv[]);
+extern int test_file(int argc, char *argv[]);
+extern int test_file2(int argc, char *argv[]);
+extern int test_float(int argc, char *argv[]);
+extern int test_hott_telemetry(int argc, char *argv[]);
+extern int test_hrt(int argc, char *argv[]);
+extern int test_int(int argc, char *argv[]);
+extern int test_jig_voltages(int argc, char *argv[]);
+extern int test_led(int argc, char *argv[]);
+extern int test_mathlib(int argc, char *argv[]);
+extern int test_matrix(int argc, char *argv[]);
+extern int test_microbench_hrt(int argc, char *argv[]);
+extern int test_microbench_math(int argc, char *argv[]);
+extern int test_microbench_matrix(int argc, char *argv[]);
+extern int test_microbench_uorb(int argc, char *argv[]);
+extern int test_mixer(int argc, char *argv[]);
+extern int test_mount(int argc, char *argv[]);
+extern int test_param(int argc, char *argv[]);
+extern int test_perf(int argc, char *argv[]);
+extern int test_ppm(int argc, char *argv[]);
+extern int test_ppm_loopback(int argc, char *argv[]);
+extern int test_rc(int argc, char *argv[]);
+extern int test_search_min(int argc, char *argv[]);
+extern int test_sensors(int argc, char *argv[]);
+extern int test_servo(int argc, char *argv[]);
+extern int test_sleep(int argc, char *argv[]);
+extern int test_time(int argc, char *argv[]);
+extern int test_tone(int argc, char *argv[]);
+extern int test_uart_baudchange(int argc, char *argv[]);
+extern int test_uart_break(int argc, char *argv[]);
+extern int test_uart_console(int argc, char *argv[]);
+extern int test_uart_loopback(int argc, char *argv[]);
+extern int test_uart_send(int argc, char *argv[]);
+extern int test_parameters(int argc, char *argv[]);
+extern int test_versioning(int argc, char *argv[]);
+extern int test_smooth_z(int argc, char *argv[]);
+extern int test_controlmath(int argc, char *argv[]);
 
 /* external */
 extern int commander_tests_main(int argc, char *argv[]);