diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/config_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/config_data.h
index 81c2274..f47c04d 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/config_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/config_data.h
@@ -30,7 +30,7 @@
 #define FULLY_CONNECTED_OUT_ACTIVATION_MIN -128
 #define FULLY_CONNECTED_OUT_ACTIVATION_MAX 127
 #define FULLY_CONNECTED_INPUT_BATCHES 3
-#define FULLY_CONNECTED_WEIGHTS_OFFSET -0.5
+#define FULLY_CONNECTED_WEIGHTS_OFFSET 0
 #define FULLY_CONNECTED_OUTPUT_MULTIPLIER 1073741824
 #define FULLY_CONNECTED_OUTPUT_SHIFT 1
 #define FULLY_CONNECTED_ACCUMULATION_DEPTH 20
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/test_arm_fully_connected_s8/test_arm_fully_connected_s8.c b/CMSIS/NN/Tests/UnitTest/TestCases/test_arm_fully_connected_s8/test_arm_fully_connected_s8.c
index 2aa5a0f..908d89a 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/test_arm_fully_connected_s8/test_arm_fully_connected_s8.c
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/test_arm_fully_connected_s8/test_arm_fully_connected_s8.c
@@ -52,6 +52,7 @@
   output_dims.c = FULLY_CONNECTED_OUT_CH;
 
   fc_params.input_offset = FULLY_CONNECTED_INPUT_OFFSET;
+  fc_params.filter_offset = FULLY_CONNECTED_WEIGHTS_OFFSET;
   fc_params.output_offset = FULLY_CONNECTED_OUTPUT_OFFSET;
   fc_params.activation.min = FULLY_CONNECTED_OUT_ACTIVATION_MIN;
   fc_params.activation.max = FULLY_CONNECTED_OUT_ACTIVATION_MAX;
diff --git a/CMSIS/NN/Tests/UnitTest/generate_test_data.py b/CMSIS/NN/Tests/UnitTest/generate_test_data.py
index 6d76dbd..e86014a 100755
--- a/CMSIS/NN/Tests/UnitTest/generate_test_data.py
+++ b/CMSIS/NN/Tests/UnitTest/generate_test_data.py
@@ -703,7 +703,7 @@
 
     def derive_filter_scale_and_zeropoint_from_min_max(self, mini, maxi):
         scale = self.derive_scale_from_min_max(mini, maxi)
-        zero = self.INT8_MIN + (-mini/scale + 0.5)
+        zero = int(self.INT8_MIN + (-mini/scale + 0.5))
         return (scale, zero)
 
     def quantize2int8(self, value, params):
@@ -773,7 +773,7 @@
                                               w_y=11, stride_x=1, stride_y=1, pad=True, randmin=-2, randmax=2,
                                               outminrange=-127, outmaxrange=127)
     dataset = 'conv_2'
-    ALL_TESTDATA_SETS[dataset] = ConvSettings(dataset, test_type, args, in_ch=2, out_ch=4, x_in=6, y_in=3, w_x=3,
+    ALL_TESTDATA_SETS[dataset] = ConvSettings(dataset, type_of_test, args, in_ch=2, out_ch=4, x_in=6, y_in=3, w_x=3,
                                               w_y=3, stride_x=1, stride_y=1, pad=True, randmin=1, randmax=4,
                                               outminrange=-126, outmaxrange=127)
     dataset = 'conv_4'  # batches > 2