diff --git a/tests/test_alarm_handler_device.py b/tests/test_alarm_handler_device.py
index 9675262b3f14c19b0475c93377a904c13dc62853..3757d8b512f632be1ab005176fb98eb73abbba34 100644
--- a/tests/test_alarm_handler_device.py
+++ b/tests/test_alarm_handler_device.py
@@ -90,7 +90,7 @@ class TestSKAAlarmHandler(object):
         """Test for GetVersionInfo"""
         # PROTECTED REGION ID(SKAAlarmHandler.test_GetVersionInfo) ENABLED START #
         versionPattern = re.compile(
-            r'SKAAlarmHandler, ska_tango_base, [0-9].[0-9].[0-9], '
+            r'SKAAlarmHandler, ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope.')
         versionInfo = tango_context.device.GetVersionInfo()
         assert (re.match(versionPattern, versionInfo[0])) is not None
@@ -142,7 +142,7 @@ class TestSKAAlarmHandler(object):
         """Test for buildState"""
         # PROTECTED REGION ID(SKAAlarmHandler.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r'ska_tango_base, [0-9].[0-9].[0-9], '
+            r'ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope')
         assert (re.match(buildPattern, tango_context.device.buildState)) is not None
         # PROTECTED REGION END #    //  SKAAlarmHandler.test_buildState
@@ -152,7 +152,7 @@ class TestSKAAlarmHandler(object):
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(SKAAlarmHandler.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r'[0-9].[0-9].[0-9]')
+        versionIdPattern = re.compile(r'[0-9]+.[0-9]+.[0-9]+')
         assert (re.match(versionIdPattern, tango_context.device.versionId)) is not None
         # PROTECTED REGION END #    //  SKAAlarmHandler.test_versionId
 
diff --git a/tests/test_base_device.py b/tests/test_base_device.py
index 71dd1f7b260e1b3bfe5ac5681ac31e4aa89f4d59..5e79d03e92440e88dd63e2d0de5505a44f17bd0b 100644
--- a/tests/test_base_device.py
+++ b/tests/test_base_device.py
@@ -426,7 +426,7 @@ class TestSKABaseDevice(object):
         """Test for GetVersionInfo"""
         # PROTECTED REGION ID(SKABaseDevice.test_GetVersionInfo) ENABLED START #
         versionPattern = re.compile(
-            r'SKABaseDevice, ska_tango_base, [0-9].[0-9].[0-9], '
+            r'SKABaseDevice, ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope.')
         versionInfo = tango_context.device.GetVersionInfo()
         assert (re.match(versionPattern, versionInfo[0])) is not None
@@ -509,7 +509,7 @@ class TestSKABaseDevice(object):
         """Test for buildState"""
         # PROTECTED REGION ID(SKABaseDevice.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r'ska_tango_base, [0-9].[0-9].[0-9], '
+            r'ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope')
         assert (re.match(buildPattern, tango_context.device.buildState)) is not None
         # PROTECTED REGION END #    //  SKABaseDevice.test_buildState
@@ -519,7 +519,7 @@ class TestSKABaseDevice(object):
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(SKABaseDevice.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r'[0-9].[0-9].[0-9]')
+        versionIdPattern = re.compile(r'[0-9]+.[0-9]+.[0-9]+')
         assert (re.match(versionIdPattern, tango_context.device.versionId)) is not None
         # PROTECTED REGION END #    //  SKABaseDevice.test_versionId
 
diff --git a/tests/test_capability_device.py b/tests/test_capability_device.py
index 6c9820931227d6d9a58c94b2411de481054e94a9..fdc287abcf734f3446f9121815054a933c47cdee 100644
--- a/tests/test_capability_device.py
+++ b/tests/test_capability_device.py
@@ -88,7 +88,7 @@ class TestSKACapability(object):
         """Test for buildState"""
         # PROTECTED REGION ID(SKACapability.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r'ska_tango_base, [0-9].[0-9].[0-9], '
+            r'ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope')
         assert (re.match(buildPattern, tango_context.device.buildState)) is not None
         # PROTECTED REGION END #    //  SKACapability.test_buildState
@@ -98,7 +98,7 @@ class TestSKACapability(object):
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(SKACapability.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r'[0-9].[0-9].[0-9]')
+        versionIdPattern = re.compile(r'[0-9]+.[0-9]+.[0-9]+')
         assert (re.match(versionIdPattern, tango_context.device.versionId)) is not None
         # PROTECTED REGION END #    //  SKACapability.test_versionId
 
diff --git a/tests/test_csp_subelement_master.py b/tests/test_csp_subelement_master.py
index 6ffaf7eaaa1fdfbcd84799063d9da58632bb128d..694fb89360629784d7a769e189c3cd9eec07281a 100644
--- a/tests/test_csp_subelement_master.py
+++ b/tests/test_csp_subelement_master.py
@@ -75,7 +75,7 @@ class TestCspSubElementMaster(object):
         """Test for GetVersionInfo"""
         # PROTECTED REGION ID(CspSubelementMaster.test_GetVersionInfo) ENABLED START #
         versionPattern = re.compile(
-            r'CspSubElementMaster, ska_tango_base, [0-9].[0-9].[0-9], '
+            r'CspSubElementMaster, ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope.')
         versionInfo = tango_context.device.GetVersionInfo()
         assert (re.match(versionPattern, versionInfo[0])) is not None
@@ -86,7 +86,7 @@ class TestCspSubElementMaster(object):
         """Test for buildState"""
         # PROTECTED REGION ID(CspSubelementMaster.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r'ska_tango_base, [0-9].[0-9].[0-9], '
+            r'ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope')
         assert (re.match(buildPattern, tango_context.device.buildState)) is not None
         # PROTECTED REGION END #    //  CspSubelementMaster.test_buildState
@@ -96,7 +96,7 @@ class TestCspSubElementMaster(object):
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(CspSubelementMaster.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r'[0-9].[0-9].[0-9]')
+        versionIdPattern = re.compile(r'[0-9]+.[0-9]+.[0-9]+')
         assert (re.match(versionIdPattern, tango_context.device.versionId)) is not None
         # PROTECTED REGION END #    //  CspSubelementMaster.test_versionId
 
diff --git a/tests/test_csp_subelement_obsdevice.py b/tests/test_csp_subelement_obsdevice.py
index 971a7f44cf54a467d331c8e5d0f21f6fbd8a35e6..963b889b9e271396ed7d8d483faf8121a6b61d45 100644
--- a/tests/test_csp_subelement_obsdevice.py
+++ b/tests/test_csp_subelement_obsdevice.py
@@ -102,7 +102,7 @@ class TestCspSubElementObsDevice(object):
         """Test for GetVersionInfo"""
         # PROTECTED REGION ID(CspSubelementObsDevice.test_GetVersionInfo) ENABLED START #
         versionPattern = re.compile(
-            r'CspSubElementObsDevice, ska_tango_base, [0-9].[0-9].[0-9], '
+            r'CspSubElementObsDevice, ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope.')
         versionInfo = tango_context.device.GetVersionInfo()
         assert (re.match(versionPattern, versionInfo[0])) is not None
@@ -114,7 +114,7 @@ class TestCspSubElementObsDevice(object):
         """Test for buildState"""
         # PROTECTED REGION ID(CspSubelementObsDevice.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r'ska_tango_base, [0-9].[0-9].[0-9], '
+            r'ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope')
         assert (re.match(buildPattern, tango_context.device.buildState)) is not None
         # PROTECTED REGION END #    //  CspSubelementObsDevice.test_buildState
@@ -124,7 +124,7 @@ class TestCspSubElementObsDevice(object):
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(CspSubelementObsDevice.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r'[0-9].[0-9].[0-9]')
+        versionIdPattern = re.compile(r'[0-9]+.[0-9]+.[0-9]+')
         assert (re.match(versionIdPattern, tango_context.device.versionId)) is not None
         # PROTECTED REGION END #    //  CspSubelementObsDevice.test_versionId
 
diff --git a/tests/test_csp_subelement_subarray.py b/tests/test_csp_subelement_subarray.py
index 1418a88854ef8b74d4d00e2e1cdcbee6408e29cb..fd5ca072adba85855fcdbdf993d99dc1e05801a1 100644
--- a/tests/test_csp_subelement_subarray.py
+++ b/tests/test_csp_subelement_subarray.py
@@ -78,7 +78,7 @@ class TestCspSubElementSubarray(object):
         """Test for GetVersionInfo"""
         # PROTECTED REGION ID(CspSubelementSubarray.test_GetVersionInfo) ENABLED START #
         versionPattern = re.compile(
-            r'CspSubElementSubarray, ska_tango_base, [0-9].[0-9].[0-9], '
+            r'CspSubElementSubarray, ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope.')
         versionInfo = tango_context.device.GetVersionInfo()
         assert (re.match(versionPattern, versionInfo[0])) is not None
@@ -89,7 +89,7 @@ class TestCspSubElementSubarray(object):
         """Test for buildState"""
         # PROTECTED REGION ID(CspSubelementSubarray.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r'ska_tango_base, [0-9].[0-9].[0-9], '
+            r'ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope')
         assert (re.match(buildPattern, tango_context.device.buildState)) is not None
         # PROTECTED REGION END #    //  CspSubelementSubarray.test_buildState
@@ -99,7 +99,7 @@ class TestCspSubElementSubarray(object):
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(CspSubelementSubarray.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r'[0-9].[0-9].[0-9]')
+        versionIdPattern = re.compile(r'[0-9]+.[0-9]+.[0-9]+')
         assert (re.match(versionIdPattern, tango_context.device.versionId)) is not None
         # PROTECTED REGION END #    //  CspSubelementSubarray.test_versionId
 
diff --git a/tests/test_logger_device.py b/tests/test_logger_device.py
index 25692affbe73ffa587d768d41c4d3abf6647dae4..f035c46833979642f7f920b4dfe3cde98f76319a 100644
--- a/tests/test_logger_device.py
+++ b/tests/test_logger_device.py
@@ -76,7 +76,7 @@ class TestSKALogger(object):
         """Test for GetVersionInfo"""
         # PROTECTED REGION ID(SKALogger.test_GetVersionInfo) ENABLED START #
         versionPattern = re.compile(
-            r"SKALogger, ska_tango_base, [0-9].[0-9].[0-9], "
+            r"SKALogger, ska_tango_base, [0-9]+.[0-9]+.[0-9]+, "
             r"A set of generic base devices for SKA Telescope."
         )
         versionInfo = tango_context.device.GetVersionInfo()
@@ -89,7 +89,7 @@ class TestSKALogger(object):
         """Test for buildState"""
         # PROTECTED REGION ID(SKALogger.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r"ska_tango_base, [0-9].[0-9].[0-9], "
+            r"ska_tango_base, [0-9]+.[0-9]+.[0-9]+, "
             r"A set of generic base devices for SKA Telescope"
         )
         assert (re.match(buildPattern, tango_context.device.buildState)) is not None
@@ -100,7 +100,7 @@ class TestSKALogger(object):
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(SKALogger.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r"[0-9].[0-9].[0-9]")
+        versionIdPattern = re.compile(r"[0-9]+.[0-9]+.[0-9]+")
         assert (re.match(versionIdPattern, tango_context.device.versionId)) is not None
         # PROTECTED REGION END #    //  SKALogger.test_versionId
 
diff --git a/tests/test_master_device.py b/tests/test_master_device.py
index 30e3b7cf6315f8e2912cb09123c0a2d10286763c..a9c9b45d23064fcdbd3361c09eed096171a01ef7 100644
--- a/tests/test_master_device.py
+++ b/tests/test_master_device.py
@@ -69,7 +69,7 @@ class TestSKAMaster(object):
         """Test for GetVersionInfo"""
         # PROTECTED REGION ID(SKAMaster.test_GetVersionInfo) ENABLED START #
         versionPattern = re.compile(
-            r'SKAMaster, ska_tango_base, [0-9].[0-9].[0-9], '
+            r'SKAMaster, ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope.')
         versionInfo = tango_context.device.GetVersionInfo()
         assert (re.match(versionPattern, versionInfo[0])) is not None
@@ -129,7 +129,7 @@ class TestSKAMaster(object):
         """Test for buildState"""
         # PROTECTED REGION ID(SKAMaster.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r'ska_tango_base, [0-9].[0-9].[0-9], '
+            r'ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope')
         assert (
             re.match(buildPattern, tango_context.device.buildState)
@@ -141,7 +141,7 @@ class TestSKAMaster(object):
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(SKAMaster.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r'[0-9].[0-9].[0-9]')
+        versionIdPattern = re.compile(r'[0-9]+.[0-9]+.[0-9]+')
         assert (
             re.match(versionIdPattern, tango_context.device.versionId)
         ) is not None
diff --git a/tests/test_obs_device.py b/tests/test_obs_device.py
index d6d8cbfa570f6d128bcb0cbb5aad78c461321c5e..7a6c230309142c3f35c013c72efd9af05c041064 100644
--- a/tests/test_obs_device.py
+++ b/tests/test_obs_device.py
@@ -72,7 +72,7 @@ class TestSKAObsDevice(object):
         """Test for GetVersionInfo"""
         # PROTECTED REGION ID(SKAObsDevice.test_GetVersionInfo) ENABLED START #
         versionPattern = re.compile(
-            r'SKAObsDevice, ska_tango_base, [0-9].[0-9].[0-9], '
+            r'SKAObsDevice, ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope.')
         versionInfo = tango_context.device.GetVersionInfo()
         assert (re.match(versionPattern, versionInfo[0])) is not None
@@ -121,7 +121,7 @@ class TestSKAObsDevice(object):
         """Test for buildState"""
         # PROTECTED REGION ID(SKAObsDevice.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r'ska_tango_base, [0-9].[0-9].[0-9], '
+            r'ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope')
         assert (re.match(buildPattern, tango_context.device.buildState)) is not None
         # PROTECTED REGION END #    //  SKAObsDevice.test_buildState
@@ -131,7 +131,7 @@ class TestSKAObsDevice(object):
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(SKAObsDevice.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r'[0-9].[0-9].[0-9]')
+        versionIdPattern = re.compile(r'[0-9]+.[0-9]+.[0-9]+')
         assert (re.match(versionIdPattern, tango_context.device.versionId)) is not None
         # PROTECTED REGION END #    //  SKAObsDevice.test_versionId
 
diff --git a/tests/test_subarray_device.py b/tests/test_subarray_device.py
index 9c817363495653ef73b9f6974ef9e6a4eab7bb56..8a1c49aaa5c0c5c1dc6652aa012a519fb43d2224 100644
--- a/tests/test_subarray_device.py
+++ b/tests/test_subarray_device.py
@@ -146,7 +146,7 @@ class TestSKASubarray:
         """Test for GetVersionInfo"""
         # PROTECTED REGION ID(SKASubarray.test_GetVersionInfo) ENABLED START #
         versionPattern = re.compile(
-            r'SKASubarray, ska_tango_base, [0-9].[0-9].[0-9], '
+            r'SKASubarray, ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope.')
         versionInfo = tango_context.device.GetVersionInfo()
         assert (re.match(versionPattern, versionInfo[0])) is not None
@@ -359,7 +359,7 @@ class TestSKASubarray:
         """Test for buildState"""
         # PROTECTED REGION ID(SKASubarray.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r'ska_tango_base, [0-9].[0-9].[0-9], '
+            r'ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope')
         assert (re.match(buildPattern, tango_context.device.buildState)) is not None
         # PROTECTED REGION END #    //  SKASubarray.test_buildState
@@ -433,7 +433,7 @@ class TestSKASubarray:
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(SKASubarray.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r'[0-9].[0-9].[0-9]')
+        versionIdPattern = re.compile(r'[0-9]+.[0-9]+.[0-9]+')
         assert (re.match(versionIdPattern, tango_context.device.versionId)) is not None
         # PROTECTED REGION END #    //  SKASubarray.test_versionId
 
diff --git a/tests/test_tel_state_device.py b/tests/test_tel_state_device.py
index 0e3b719c59a9987c2abcc4142ee7761682737a23..6f3eb7d8d559318cc6e7230d5ddc24424c1230e5 100644
--- a/tests/test_tel_state_device.py
+++ b/tests/test_tel_state_device.py
@@ -66,7 +66,7 @@ class TestSKATelState(object):
         """Test for GetVersionInfo"""
         # PROTECTED REGION ID(SKATelState.test_GetVersionInfo) ENABLED START #
         versionPattern = re.compile(
-            r'SKATelState, ska_tango_base, [0-9].[0-9].[0-9], '
+            r'SKATelState, ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope.')
         versionInfo = tango_context.device.GetVersionInfo()
         assert (re.match(versionPattern, versionInfo[0])) is not None
@@ -78,7 +78,7 @@ class TestSKATelState(object):
         """Test for buildState"""
         # PROTECTED REGION ID(SKATelState.test_buildState) ENABLED START #
         buildPattern = re.compile(
-            r'ska_tango_base, [0-9].[0-9].[0-9], '
+            r'ska_tango_base, [0-9]+.[0-9]+.[0-9]+, '
             r'A set of generic base devices for SKA Telescope')
         assert (re.match(buildPattern, tango_context.device.buildState)) is not None
         # PROTECTED REGION END #    //  SKATelState.test_buildState
@@ -88,7 +88,7 @@ class TestSKATelState(object):
     def test_versionId(self, tango_context):
         """Test for versionId"""
         # PROTECTED REGION ID(SKATelState.test_versionId) ENABLED START #
-        versionIdPattern = re.compile(r'[0-9].[0-9].[0-9]')
+        versionIdPattern = re.compile(r'[0-9]+.[0-9]+.[0-9]+')
         assert (re.match(versionIdPattern, tango_context.device.versionId)) is not None
         # PROTECTED REGION END #    //  SKATelState.test_versionId