diff --git a/function_test/BER_EncDec/Makefile b/function_test/BER_EncDec/Makefile
index 252069089ab3e02c850f23d98c874abfc2ac62b6..34bd420cb3678e4c17057b8a28f932d31d682a69 100644
--- a/function_test/BER_EncDec/Makefile
+++ b/function_test/BER_EncDec/Makefile
@@ -109,16 +109,14 @@ USER_SOURCES =
 USER_HEADERS =
 
 # All object files needed for the executable test suite:
-OBJECTS = $(GENERATED_OBJECTS) $(USER_OBJECTS)
+OBJECTS = $(GENERATED_OBJECTS)
 
 GENERATED_OBJECTS = BER_EncDec_1.o BER_EncDec_10.o BER_EncDec_100.o BER_EncDec_101.o BER_EncDec_102.o BER_EncDec_103.o BER_EncDec_104.o BER_EncDec_105.o BER_EncDec_106.o BER_EncDec_107.o BER_EncDec_108.o BER_EncDec_109.o BER_EncDec_11.o BER_EncDec_110.o BER_EncDec_111.o BER_EncDec_112.o BER_EncDec_113.o BER_EncDec_114.o BER_EncDec_115.o BER_EncDec_116.o BER_EncDec_117.o BER_EncDec_118.o BER_EncDec_119.o BER_EncDec_12.o BER_EncDec_120.o BER_EncDec_121.o BER_EncDec_122.o BER_EncDec_123.o BER_EncDec_124.o BER_EncDec_125.o BER_EncDec_126.o BER_EncDec_127.o BER_EncDec_128.o BER_EncDec_129.o BER_EncDec_13.o BER_EncDec_130.o BER_EncDec_131.o BER_EncDec_132.o BER_EncDec_133.o BER_EncDec_134.o BER_EncDec_135.o BER_EncDec_136.o BER_EncDec_137.o BER_EncDec_138.o BER_EncDec_139.o BER_EncDec_14.o BER_EncDec_140.o BER_EncDec_141.o BER_EncDec_142.o BER_EncDec_143.o BER_EncDec_144.o BER_EncDec_145.o BER_EncDec_146.o BER_EncDec_147.o BER_EncDec_148.o BER_EncDec_149.o BER_EncDec_15.o BER_EncDec_150.o BER_EncDec_151.o BER_EncDec_152.o BER_EncDec_153.o BER_EncDec_154.o BER_EncDec_155.o BER_EncDec_156.o BER_EncDec_157.o BER_EncDec_158.o BER_EncDec_159.o BER_EncDec_16.o BER_EncDec_160.o BER_EncDec_161.o BER_EncDec_162.o BER_EncDec_163.o BER_EncDec_164.o BER_EncDec_165.o BER_EncDec_17.o BER_EncDec_18.o BER_EncDec_19.o BER_EncDec_2.o BER_EncDec_20.o BER_EncDec_21.o BER_EncDec_22.o BER_EncDec_23.o BER_EncDec_24.o BER_EncDec_25.o BER_EncDec_26.o BER_EncDec_27.o BER_EncDec_28.o BER_EncDec_29.o BER_EncDec_3.o BER_EncDec_30.o BER_EncDec_31.o BER_EncDec_32.o BER_EncDec_33.o BER_EncDec_34.o BER_EncDec_35.o BER_EncDec_36.o BER_EncDec_37.o BER_EncDec_38.o BER_EncDec_39.o BER_EncDec_4.o BER_EncDec_40.o BER_EncDec_41.o BER_EncDec_42.o BER_EncDec_43.o BER_EncDec_44.o BER_EncDec_45.o BER_EncDec_46.o BER_EncDec_47.o BER_EncDec_48.o BER_EncDec_49.o BER_EncDec_5.o BER_EncDec_50.o BER_EncDec_51.o BER_EncDec_52.o BER_EncDec_53.o BER_EncDec_54.o BER_EncDec_55.o BER_EncDec_56.o BER_EncDec_57.o BER_EncDec_58.o BER_EncDec_59.o BER_EncDec_6.o BER_EncDec_60.o BER_EncDec_61.o BER_EncDec_62.o BER_EncDec_63.o BER_EncDec_64.o BER_EncDec_65.o BER_EncDec_66.o BER_EncDec_67.o BER_EncDec_68.o BER_EncDec_69.o BER_EncDec_7.o BER_EncDec_70.o BER_EncDec_71.o BER_EncDec_72.o BER_EncDec_73.o BER_EncDec_74.o BER_EncDec_75.o BER_EncDec_76.o BER_EncDec_77.o BER_EncDec_78.o BER_EncDec_79.o BER_EncDec_8.o BER_EncDec_80.o BER_EncDec_81.o BER_EncDec_82.o BER_EncDec_83.o BER_EncDec_84.o BER_EncDec_85.o BER_EncDec_86.o BER_EncDec_87.o BER_EncDec_88.o BER_EncDec_89.o BER_EncDec_9.o BER_EncDec_90.o BER_EncDec_91.o BER_EncDec_92.o BER_EncDec_93.o BER_EncDec_94.o BER_EncDec_95.o BER_EncDec_96.o BER_EncDec_97.o BER_EncDec_98.o BER_EncDec_99.o BER_EncDecA_1.o BER_EncDecA_10.o BER_EncDecA_100.o BER_EncDecA_101.o BER_EncDecA_102.o BER_EncDecA_103.o BER_EncDecA_104.o BER_EncDecA_105.o BER_EncDecA_106.o BER_EncDecA_107.o BER_EncDecA_108.o BER_EncDecA_109.o BER_EncDecA_11.o BER_EncDecA_110.o BER_EncDecA_111.o BER_EncDecA_112.o BER_EncDecA_113.o BER_EncDecA_114.o BER_EncDecA_115.o BER_EncDecA_116.o BER_EncDecA_117.o BER_EncDecA_118.o BER_EncDecA_119.o BER_EncDecA_12.o BER_EncDecA_120.o BER_EncDecA_121.o BER_EncDecA_122.o BER_EncDecA_123.o BER_EncDecA_124.o BER_EncDecA_125.o BER_EncDecA_126.o BER_EncDecA_127.o BER_EncDecA_128.o BER_EncDecA_129.o BER_EncDecA_13.o BER_EncDecA_130.o BER_EncDecA_131.o BER_EncDecA_132.o BER_EncDecA_133.o BER_EncDecA_134.o BER_EncDecA_135.o BER_EncDecA_136.o BER_EncDecA_137.o BER_EncDecA_138.o BER_EncDecA_139.o BER_EncDecA_14.o BER_EncDecA_140.o BER_EncDecA_141.o BER_EncDecA_142.o BER_EncDecA_143.o BER_EncDecA_144.o BER_EncDecA_145.o BER_EncDecA_146.o BER_EncDecA_147.o BER_EncDecA_148.o BER_EncDecA_149.o BER_EncDecA_15.o BER_EncDecA_150.o BER_EncDecA_151.o BER_EncDecA_152.o BER_EncDecA_153.o BER_EncDecA_154.o BER_EncDecA_155.o BER_EncDecA_156.o BER_EncDecA_157.o BER_EncDecA_158.o BER_EncDecA_159.o BER_EncDecA_16.o BER_EncDecA_160.o BER_EncDecA_161.o BER_EncDecA_162.o BER_EncDecA_163.o BER_EncDecA_164.o BER_EncDecA_165.o BER_EncDecA_17.o BER_EncDecA_18.o BER_EncDecA_19.o BER_EncDecA_2.o BER_EncDecA_20.o BER_EncDecA_21.o BER_EncDecA_22.o BER_EncDecA_23.o BER_EncDecA_24.o BER_EncDecA_25.o BER_EncDecA_26.o BER_EncDecA_27.o BER_EncDecA_28.o BER_EncDecA_29.o BER_EncDecA_3.o BER_EncDecA_30.o BER_EncDecA_31.o BER_EncDecA_32.o BER_EncDecA_33.o BER_EncDecA_34.o BER_EncDecA_35.o BER_EncDecA_36.o BER_EncDecA_37.o BER_EncDecA_38.o BER_EncDecA_39.o BER_EncDecA_4.o BER_EncDecA_40.o BER_EncDecA_41.o BER_EncDecA_42.o BER_EncDecA_43.o BER_EncDecA_44.o BER_EncDecA_45.o BER_EncDecA_46.o BER_EncDecA_47.o BER_EncDecA_48.o BER_EncDecA_49.o BER_EncDecA_5.o BER_EncDecA_50.o BER_EncDecA_51.o BER_EncDecA_52.o BER_EncDecA_53.o BER_EncDecA_54.o BER_EncDecA_55.o BER_EncDecA_56.o BER_EncDecA_57.o BER_EncDecA_58.o BER_EncDecA_59.o BER_EncDecA_6.o BER_EncDecA_60.o BER_EncDecA_61.o BER_EncDecA_62.o BER_EncDecA_63.o BER_EncDecA_64.o BER_EncDecA_65.o BER_EncDecA_66.o BER_EncDecA_67.o BER_EncDecA_68.o BER_EncDecA_69.o BER_EncDecA_7.o BER_EncDecA_70.o BER_EncDecA_71.o BER_EncDecA_72.o BER_EncDecA_73.o BER_EncDecA_74.o BER_EncDecA_75.o BER_EncDecA_76.o BER_EncDecA_77.o BER_EncDecA_78.o BER_EncDecA_79.o BER_EncDecA_8.o BER_EncDecA_80.o BER_EncDecA_81.o BER_EncDecA_82.o BER_EncDecA_83.o BER_EncDecA_84.o BER_EncDecA_85.o BER_EncDecA_86.o BER_EncDecA_87.o BER_EncDecA_88.o BER_EncDecA_89.o BER_EncDecA_9.o BER_EncDecA_90.o BER_EncDecA_91.o BER_EncDecA_92.o BER_EncDecA_93.o BER_EncDecA_94.o BER_EncDecA_95.o BER_EncDecA_96.o BER_EncDecA_97.o BER_EncDecA_98.o BER_EncDecA_99.o
 
-USER_OBJECTS =
-
 # The name of the executable test suite:
 TARGET = BER_EncDec.exe
 
-ifdef COVERAGE
+ifeq ($(COVERAGE), yes)
 CPPFLAGS += -fprofile-arcs -ftest-coverage -g
 CXXFLAGS += -fprofile-arcs -ftest-coverage -g
 LDFLAGS += -fprofile-arcs -ftest-coverage -g -lgcov
diff --git a/function_test/RAW_EncDec/Makefile b/function_test/RAW_EncDec/Makefile
index 207e29c1ec525e264511f54e1bdf08d5c13bc60c..95075ec09b7bc086434c5ec9b91e8bf50027d17d 100644
--- a/function_test/RAW_EncDec/Makefile
+++ b/function_test/RAW_EncDec/Makefile
@@ -103,12 +103,10 @@ USER_SOURCES =
 USER_HEADERS =
 
 # All object files needed for the executable test suite:
-OBJECTS = $(GENERATED_OBJECTS) $(USER_OBJECTS)
+OBJECTS = $(GENERATED_OBJECTS)
 
 GENERATED_OBJECTS = RAW_EncDec_1.o RAW_EncDec_2.o RAW_EncDec_3.o RAW_EncDec_4.o RAW_EncDec_5.o RAW_EncDec_6.o RAW_EncDec_7.o RAW_EncDec_8.o
 
-USER_OBJECTS =
-
 # The name of the executable test suite:
 TARGET = RAW_EncDec.exe
 
diff --git a/function_test/Text_EncDec/Makefile b/function_test/Text_EncDec/Makefile
index 1df015092400df68c0e951b4ed779c655e6602d0..148efce4923d45444b1801a5bdf2c5797d2b7126 100644
--- a/function_test/Text_EncDec/Makefile
+++ b/function_test/Text_EncDec/Makefile
@@ -100,12 +100,10 @@ USER_SOURCES =
 USER_HEADERS =
 
 # Object files of this project that are needed for the executable test suite:
-OBJECTS = $(GENERATED_OBJECTS) $(USER_OBJECTS)
+OBJECTS = $(GENERATED_OBJECTS)
 
 GENERATED_OBJECTS = Text_EncDec_1.o Text_EncDec_2.o Text_EncDec_3.o Text_EncDec_4.o
 
-USER_OBJECTS =
-
 # The name of the executable test suite:
 TARGET = Text_EncDec.exe
 
diff --git a/function_test/XER_EncDec/Makefile b/function_test/XER_EncDec/Makefile
index 1bb4c115288940e85efdacc40d26c81930aeb2dd..eb93211a27f5a243c71ade823a5ad62b9a7d3f28 100644
--- a/function_test/XER_EncDec/Makefile
+++ b/function_test/XER_EncDec/Makefile
@@ -99,12 +99,10 @@ USER_SOURCES =
 USER_HEADERS =
 
 # All object files needed for the executable test suite:
-OBJECTS = $(GENERATED_OBJECTS) $(USER_OBJECTS)
+OBJECTS = $(GENERATED_OBJECTS)
 
 GENERATED_OBJECTS = XER_EncDec_1.o XER_EncDec_10.o XER_EncDec_11.o XER_EncDec_12.o XER_EncDec_13.o XER_EncDec_14.o XER_EncDec_15.o XER_EncDec_16.o XER_EncDec_17.o XER_EncDec_18.o XER_EncDec_19.o XER_EncDec_2.o XER_EncDec_20.o XER_EncDec_21.o XER_EncDec_22.o XER_EncDec_23.o XER_EncDec_24.o XER_EncDec_25.o XER_EncDec_26.o XER_EncDec_27.o XER_EncDec_28.o XER_EncDec_29.o XER_EncDec_3.o XER_EncDec_30.o XER_EncDec_4.o XER_EncDec_5.o XER_EncDec_6.o XER_EncDec_7.o XER_EncDec_8.o XER_EncDec_9.o
 
-USER_OBJECTS =
-
 # The name of the executable test suite:
 TARGET = XER_EncDec.exe