diff --git a/tests/netedit/additionalelements/calibrator/inspect/edge/test.py b/tests/netedit/additionalelements/calibrator/inspect/edge/test.py
index 1d7e1185f6b5..421194b95777 100755
--- a/tests/netedit/additionalelements/calibrator/inspect/edge/test.py
+++ b/tests/netedit/additionalelements/calibrator/inspect/edge/test.py
@@ -44,10 +44,10 @@
 netedit.leftClick(referencePosition, 474, 194)
 
 # Change parameter id with a non valid value (non existent ID)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edgeLane, "dummyEdge", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edge, "dummyEdge", True)
 
 # Change parameter id with a valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edgeLane, "top", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edge, "top", True)
 
 # Check undos and redos
 netedit.checkUndoRedo(referencePosition)
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/id/test.py b/tests/netedit/additionalelements/calibratorlane/inspect/id/test.py
index 206b16084459..99a67668639e 100755
--- a/tests/netedit/additionalelements/calibratorlane/inspect/id/test.py
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/id/test.py
@@ -53,13 +53,13 @@
 netedit.leftClick(referencePosition, 463, 229)
 
 # Change parameter id with a non valid value (Duplicated ID)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.id, "ca_0", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.id, "ca_0", True)
 
 # Change parameter id with a non valid value (Invalid ID)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.id, "Id with spaces", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.id, "Id with spaces", True)
 
 # Change parameter id with a valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.id, "correctID", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.id, "correctID", True)
 
 # Check undos and redos
 netedit.checkUndoRedo(referencePosition)
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/jamtreshold/test.py b/tests/netedit/additionalelements/calibratorlane/inspect/jamtreshold/test.py
index be7c961dd752..b4d5c8b083b9 100755
--- a/tests/netedit/additionalelements/calibratorlane/inspect/jamtreshold/test.py
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/jamtreshold/test.py
@@ -44,13 +44,13 @@
 netedit.leftClick(referencePosition, 463, 229)
 
 # Change parameter id with a non valid value (invalid characters)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.vTypes, "///;;", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.vTypes, "///;;", True)
 
 # Change parameter id with valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.vTypes, "", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.vTypes, "", True)
 
 # Change parameter id with valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.vTypes, "type1 type2", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.vTypes, "type1 type2", True)
 
 # Check undos and redos
 netedit.checkUndoRedo(referencePosition)
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/lane/output.netedit b/tests/netedit/additionalelements/calibratorlane/inspect/lane/output.netedit
index 5f99868f5c42..9d10065a8cb4 100644
--- a/tests/netedit/additionalelements/calibratorlane/inspect/lane/output.netedit
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/lane/output.netedit
@@ -4,7 +4,7 @@ TestFunctions: 'reference.png' found. Position: 304 - 168
 calibratorLane
 TestFunctions: Clicked over position 616 - 418
 TestFunctions: Clicked over position 767 - 397
-dummyEdge
+dummyLane
 top
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/lane/test.py b/tests/netedit/additionalelements/calibratorlane/inspect/lane/test.py
index 3587a2da0bc9..1ae95cdc10af 100755
--- a/tests/netedit/additionalelements/calibratorlane/inspect/lane/test.py
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/lane/test.py
@@ -44,10 +44,10 @@
 netedit.leftClick(referencePosition, 463, 229)
 
 # Change parameter id with a non valid value (non existent ID)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edgeLane, "dummyEdge", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.lane, "dummyLane", True)
 
 # Change parameter id with a valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edgeLane, "top", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.lane, "top", True)
 
 # Check undos and redos
 netedit.checkUndoRedo(referencePosition)
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/name/test.py b/tests/netedit/additionalelements/calibratorlane/inspect/name/test.py
index d587bc84527c..002aceb022d0 100755
--- a/tests/netedit/additionalelements/calibratorlane/inspect/name/test.py
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/name/test.py
@@ -44,10 +44,10 @@
 netedit.leftClick(referencePosition, 463, 229)
 
 # Change parameter id with a non valid value (invalid characters)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.name, "///", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.name, "///", True)
 
 # Change parameter id with valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.name, "customName", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.name, "customName", True)
 
 # Check undos and redos
 netedit.checkUndoRedo(referencePosition)
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/output/test.py b/tests/netedit/additionalelements/calibratorlane/inspect/output/test.py
index bd312471f4d4..454e505bc100 100755
--- a/tests/netedit/additionalelements/calibratorlane/inspect/output/test.py
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/output/test.py
@@ -44,10 +44,10 @@
 netedit.leftClick(referencePosition, 463, 229)
 
 # Change parameter id with a non valid value (invalid characters)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.output, "///;;", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.output, "///;;", True)
 
 # Change parameter id with valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.output, "myOwnFilename", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.output, "myOwnFilename", True)
 
 # Check undos and redos
 netedit.checkUndoRedo(referencePosition)
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/parameters/test.py b/tests/netedit/additionalelements/calibratorlane/inspect/parameters/test.py
index bd19f38f62e5..a0f895f07b1d 100755
--- a/tests/netedit/additionalelements/calibratorlane/inspect/parameters/test.py
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/parameters/test.py
@@ -44,7 +44,7 @@
 netedit.leftClick(referencePosition, 463, 229)
 
 # check parameters
-netedit.checkParameters(referencePosition, netedit.attrs.calibrator.inspect.parameters, True)
+netedit.checkParameters(referencePosition, netedit.attrs.calibrator.inspectLane.parameters, True)
 
 # save netedit config
 netedit.saveNeteditConfig(referencePosition)
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/period/test.py b/tests/netedit/additionalelements/calibratorlane/inspect/period/test.py
index dd671eec2ce1..c06ff7404ccd 100755
--- a/tests/netedit/additionalelements/calibratorlane/inspect/period/test.py
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/period/test.py
@@ -44,13 +44,13 @@
 netedit.leftClick(referencePosition, 463, 229)
 
 # Change parameter id with a non valid value (dummy)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.frequency, "dummyFreq", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.frequency, "dummyFreq", True)
 
 # Change parameter id with a non valid value (negative)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.frequency, "-12", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.frequency, "-12", True)
 
 # Change parameter id with a valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.frequency, "12.5", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.frequency, "12.5", True)
 
 # Check undos and redos
 netedit.checkUndoRedo(referencePosition)
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/pos/test.py b/tests/netedit/additionalelements/calibratorlane/inspect/pos/test.py
index 08728334fd2f..7ba5d7b3f10d 100755
--- a/tests/netedit/additionalelements/calibratorlane/inspect/pos/test.py
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/pos/test.py
@@ -44,16 +44,16 @@
 netedit.leftClick(referencePosition, 463, 229)
 
 # Change parameter id with a non valid value (dummy)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.pos, "dummyPos", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.pos, "dummyPos", True)
 
 # Change parameter id with a valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.pos, "-12", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.pos, "-12", True)
 
 # Change parameter id with a valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.pos, "5000", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.pos, "5000", True)
 
 # Change parameter id with a valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.pos, "10", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.pos, "10", True)
 
 # Check undos and redos
 netedit.checkUndoRedo(referencePosition)
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/routeprobe/test.py b/tests/netedit/additionalelements/calibratorlane/inspect/routeprobe/test.py
index 9925a17c0b6b..59a8e5a352a4 100755
--- a/tests/netedit/additionalelements/calibratorlane/inspect/routeprobe/test.py
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/routeprobe/test.py
@@ -44,13 +44,13 @@
 netedit.leftClick(referencePosition, 463, 229)
 
 # Change parameter id with a non valid value (invalid characters)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.routeProbe, "///;;", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.routeProbe, "///;;", True)
 
 # Change parameter id with valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.routeProbe, "nonExistentRouteProbe", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.routeProbe, "nonExistentRouteProbe", True)
 
 # Change parameter id with valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.routeProbe, "routeProbe_0", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.routeProbe, "routeProbe_0", True)
 
 # Check undos and redos
 netedit.checkUndoRedo(referencePosition)
diff --git a/tests/netedit/additionalelements/calibratorlane/inspect/vtypes/test.py b/tests/netedit/additionalelements/calibratorlane/inspect/vtypes/test.py
index cd1dea9c06d3..612dc5842c0e 100755
--- a/tests/netedit/additionalelements/calibratorlane/inspect/vtypes/test.py
+++ b/tests/netedit/additionalelements/calibratorlane/inspect/vtypes/test.py
@@ -44,13 +44,13 @@
 netedit.leftClick(referencePosition, 463, 229)
 
 # Change parameter id with a non valid value (invalid characters)
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.jamTreshold, "dummyJam", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.jamTreshold, "dummyJam", True)
 
 # Change parameter id with valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.jamTreshold, "-5", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.jamTreshold, "-5", True)
 
 # Change parameter id with valid value
-netedit.modifyAttribute(netedit.attrs.calibrator.inspect.jamTreshold, "7.7", True)
+netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.jamTreshold, "7.7", True)
 
 # Check undos and redos
 netedit.checkUndoRedo(referencePosition)
diff --git a/tests/netedit/additionalelements/chargingstation/inspect_selection/additionals.add.xml b/tests/netedit/additionalelements/chargingstation/inspect_selection/additionals.add.xml
index 1584fc6977d7..734d2f16bfd3 100644
--- a/tests/netedit/additionalelements/chargingstation/inspect_selection/additionals.add.xml
+++ b/tests/netedit/additionalelements/chargingstation/inspect_selection/additionals.add.xml
@@ -1,13 +1,13 @@
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- chargingStation A -->
-    <chargingStation id="chargingStationA" lane="center1_1" startPos="5" endPos="10" power="21000.00" efficiency="0.65" chargeInTransit="0" chargeDelay="1.00" name="chargingStationNameA" friendlyPos="false">
+    <chargingStation id="chargingStationA" lane="center1_1" startPos="5" endPos="10" power="21000.00" efficiency="0.65" chargeInTransit="0" chargeDelay="1.00" name="chargingStationNameA" chargeType="electric" waitingTime="600" friendlyPos="false">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA3" value="valueA2"/>
         <param key="KeyA2" value="valueA3"/>
     </chargingStation>
 
     <!-- chargingStation B -->
-    <chargingStation id="chargingStationB" lane="center1_1" startPos="15" endPos="20" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2.00" name="chargingStationNameB" friendlyPos="true">
+    <chargingStation id="chargingStationB" lane="center1_1" startPos="15" endPos="20" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2.00" name="chargingStationNameB" chargeType="fuel" waitingTime="500" friendlyPos="true">
         <param key="KeyB1" value="valueB1"/>
         <param key="KeyB3" value="valueB2"/>
         <param key="KeyB2" value="valueB3"/>
diff --git a/tests/netedit/additionalelements/chargingstation/inspect_selection/chargedelay/additionals.netedit b/tests/netedit/additionalelements/chargingstation/inspect_selection/chargedelay/additionals.netedit
index 7efd8224c7eb..0ae1843455f9 100644
--- a/tests/netedit/additionalelements/chargingstation/inspect_selection/chargedelay/additionals.netedit
+++ b/tests/netedit/additionalelements/chargingstation/inspect_selection/chargedelay/additionals.netedit
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-02-13 16:07:53 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
+<!-- generated on 2023-09-06 16:27:26 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="6300">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="6300" chargeType="electric" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
     </chargingStation>
-    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="6300">
+    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="6300" chargeType="fuel" waitingTime="500.00">
         <param key="KeyB1" value="valueB1"/>
         <param key="KeyB2" value="valueB3"/>
         <param key="KeyB3" value="valueB2"/>
diff --git a/tests/netedit/additionalelements/chargingstation/inspect_selection/chargeintransit/additionals.netedit b/tests/netedit/additionalelements/chargingstation/inspect_selection/chargeintransit/additionals.netedit
index d4fe49917af4..440ec7ab1160 100644
--- a/tests/netedit/additionalelements/chargingstation/inspect_selection/chargeintransit/additionals.netedit
+++ b/tests/netedit/additionalelements/chargingstation/inspect_selection/chargeintransit/additionals.netedit
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-02-13 16:06:24 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
+<!-- generated on 2023-09-06 16:25:37 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeInTransit="1" chargeDelay="1000">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeInTransit="1" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
     </chargingStation>
-    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000">
+    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
         <param key="KeyB1" value="valueB1"/>
         <param key="KeyB2" value="valueB3"/>
         <param key="KeyB3" value="valueB2"/>
diff --git a/tests/netedit/additionalelements/chargingstation/inspect_selection/efficiency/additionals.netedit b/tests/netedit/additionalelements/chargingstation/inspect_selection/efficiency/additionals.netedit
index 8e30cbabd850..fc1978739579 100644
--- a/tests/netedit/additionalelements/chargingstation/inspect_selection/efficiency/additionals.netedit
+++ b/tests/netedit/additionalelements/chargingstation/inspect_selection/efficiency/additionals.netedit
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-02-13 16:05:14 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
+<!-- generated on 2023-09-06 16:24:03 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.50" chargeDelay="1000">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.50" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
     </chargingStation>
-    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.50" chargeInTransit="1" chargeDelay="2000">
+    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.50" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
         <param key="KeyB1" value="valueB1"/>
         <param key="KeyB2" value="valueB3"/>
         <param key="KeyB3" value="valueB2"/>
diff --git a/tests/netedit/additionalelements/chargingstation/inspect_selection/friendlypos/additionals.netedit b/tests/netedit/additionalelements/chargingstation/inspect_selection/friendlypos/additionals.netedit
index e017358f0845..c703af1d4a84 100644
--- a/tests/netedit/additionalelements/chargingstation/inspect_selection/friendlypos/additionals.netedit
+++ b/tests/netedit/additionalelements/chargingstation/inspect_selection/friendlypos/additionals.netedit
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-02-13 16:02:21 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
+<!-- generated on 2023-09-06 16:20:30 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" friendlyPos="true" power="21000.00" efficiency="0.65" chargeDelay="1000">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" friendlyPos="true" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
     </chargingStation>
-    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000">
+    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
         <param key="KeyB1" value="valueB1"/>
         <param key="KeyB2" value="valueB3"/>
         <param key="KeyB3" value="valueB2"/>
diff --git a/tests/netedit/additionalelements/chargingstation/inspect_selection/name/additionals.netedit b/tests/netedit/additionalelements/chargingstation/inspect_selection/name/additionals.netedit
index 5e5cccf6d68a..6a69cf9fd933 100644
--- a/tests/netedit/additionalelements/chargingstation/inspect_selection/name/additionals.netedit
+++ b/tests/netedit/additionalelements/chargingstation/inspect_selection/name/additionals.netedit
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-02-13 16:01:12 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
+<!-- generated on 2023-09-06 16:18:57 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="commonName" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="1000">
+    <chargingStation id="chargingStationA" name="commonName" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
     </chargingStation>
-    <chargingStation id="chargingStationB" name="commonName" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000">
+    <chargingStation id="chargingStationB" name="commonName" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
         <param key="KeyB1" value="valueB1"/>
         <param key="KeyB2" value="valueB3"/>
         <param key="KeyB3" value="valueB2"/>
diff --git a/tests/netedit/additionalelements/chargingstation/inspect_selection/parameters/additionals.netedit b/tests/netedit/additionalelements/chargingstation/inspect_selection/parameters/additionals.netedit
index 1e4026f9ce4f..0a18132fa015 100644
--- a/tests/netedit/additionalelements/chargingstation/inspect_selection/parameters/additionals.netedit
+++ b/tests/netedit/additionalelements/chargingstation/inspect_selection/parameters/additionals.netedit
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-02-13 16:10:41 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
+<!-- generated on 2023-09-06 16:50:55 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="1000">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
         <param key="keyFinal1" value="value1"/>
         <param key="keyFinal2" value="value2"/>
         <param key="keyFinal3" value="value3"/>
     </chargingStation>
-    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000">
+    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
         <param key="keyFinal1" value="value1"/>
         <param key="keyFinal2" value="value2"/>
         <param key="keyFinal3" value="value3"/>
diff --git a/tests/netedit/additionalelements/chargingstation/inspect_selection/power/additionals.netedit b/tests/netedit/additionalelements/chargingstation/inspect_selection/power/additionals.netedit
index be7d0b5220e2..2c2df3002a2b 100644
--- a/tests/netedit/additionalelements/chargingstation/inspect_selection/power/additionals.netedit
+++ b/tests/netedit/additionalelements/chargingstation/inspect_selection/power/additionals.netedit
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-02-13 16:03:47 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
+<!-- generated on 2023-09-06 16:22:16 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="11000.00" efficiency="0.65" chargeDelay="1000">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="11000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
     </chargingStation>
-    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="11000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000">
+    <chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="11000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
         <param key="KeyB1" value="valueB1"/>
         <param key="KeyB2" value="valueB3"/>
         <param key="KeyB3" value="valueB2"/>
diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py
index 38a68bfe001e..bfcbcbd184b4 100644
--- a/tests/netedit/attributesEnum.py
+++ b/tests/netedit/attributesEnum.py
@@ -767,8 +767,10 @@ class create:
         efficiency = 9
         chargeInTransit = 10
         chargeDelay = 11
-        references = 15
-        length = 17
+        chargeType = 12
+        waitingTime = 14
+        references = 18
+        length = 20
 
     class inspect:
         id = 1
@@ -782,7 +784,9 @@ class inspect:
         efficiency = 9
         chargeInTransit = 10
         chargeDelay = 11
-        parameters = 14
+        chargeType = 12
+        waitingTime = 14 
+        parameters = 17
 
     class inspectSelection:
         name = 1
@@ -791,7 +795,9 @@ class inspectSelection:
         efficiency = 4
         chargeInTrainsit = 5
         chargeDelay = 6
-        parameters = 9
+        chargeType = 7
+        waitingTime = 9         
+        parameters = 12
 
 # access
 
@@ -1117,7 +1123,7 @@ class create:
 
     class inspect:
         id = 1
-        edgeLane = 2
+        edge = 2
         pos = 3
         frequency = 4
         name = 5
@@ -1127,6 +1133,19 @@ class inspect:
         vTypes = 9
         parameters = 12
 
+    class inspectLane:
+        id = 1
+        lane = 2
+        laneMoveUp = 3
+        pos = 4
+        frequency = 5
+        name = 6
+        routeProbe = 7
+        output = 8
+        jamTreshold = 9
+        vTypes = 10
+        parameters = 13        
+
     class inspectSelection:
         pos = 1
         frequency = 2
diff --git a/tests/netedit/neteditTestFunctions.py b/tests/netedit/neteditTestFunctions.py
index a333ba7652fd..5c461c4202e3 100644
--- a/tests/netedit/neteditTestFunctions.py
+++ b/tests/netedit/neteditTestFunctions.py
@@ -343,7 +343,7 @@ def getReferenceMatch(neProcess, makeScrenshot):
         # wait for reference
         time.sleep(DELAY_REFERENCE)
     # capture screen and search reference
-        positionOnScreen = pyautogui.locateOnScreen(_REFERENCE_PNG, minSearchTime=3)
+        positionOnScreen = pyautogui.locateOnScreen(_REFERENCE_PNG, minSearchTime=3, confidence=0.95)
     except Exception as e:
         # we cannot specify the exception here because some versions of pyautogui use one and some don't
         print(e)