diff --git a/atests/hw_dependant_results/nfc/log.html b/atests/hw_dependant_results/nfc/log.html
index f2e12e4..8af3658 100644
--- a/atests/hw_dependant_results/nfc/log.html
+++ b/atests/hw_dependant_results/nfc/log.html
@@ -2071,25 +2071,25 @@
 window.output = {};
 </script>
 <script type="text/javascript">
-window.output["suite"] = [1,2,3,0,[],[1,0,1479],[[4,5,6,7,[],[1,38,1439],[],[[8,0,9,[10],[1,150,317],[[0,11,12,0,13,14,15,0,[1,152,5],[[156,2,16],[156,2,17]]],[0,18,19,0,20,21,0,0,[1,157,251],[[408,2,22]]],[0,23,12,0,0,0,0,0,[1,409,0],[]],[0,24,25,0,26,0,0,0,[1,410,4],[[414,2,27]]],[0,28,25,0,29,0,0,0,[1,415,3],[[418,2,30]]],[0,31,0,0,0,0,0,0,[1,419,13],[[0,32,0,0,0,0,33,0,[1,423,6],[[0,34,12,0,35,0,0,0,[1,424,0],[]],[0,36,25,0,37,0,33,0,[1,425,3],[[427,2,38],[427,2,39]]],[8,0,0,0,0,33,0,0,[1,428,0],[]],[429,2,39]]],[0,40,25,0,41,0,0,0,[1,429,2],[[431,2,42],[431,2,43]]],[8,0,0,0,0,33,0,0,[1,431,0],[]]]],[0,44,0,0,0,0,45,0,[1,433,14],[[0,32,0,0,0,0,33,0,[1,436,7],[[0,34,12,0,35,0,0,0,[1,437,1],[]],[0,36,25,0,37,0,33,0,[1,439,3],[[441,2,46],[441,2,47]]],[8,0,0,0,0,33,0,0,[1,442,0],[]],[443,2,47]]],[0,40,25,0,41,0,0,0,[1,444,2],[[445,2,48],[445,2,49]]],[8,0,0,0,0,33,0,0,[1,446,0],[]],[447,2,50]]],[0,51,25,0,41,0,0,0,[1,448,4],[[452,2,52],[452,2,53]]],[0,54,12,0,0,0,0,0,[1,453,0],[]],[2,55,12,0,56,0,0,0,[1,454,12],[]]]],[57,0,58,[10],[1,468,300],[[0,11,12,0,13,14,15,0,[1,469,2],[[471,2,16],[471,2,17]]],[0,18,19,0,20,21,0,0,[1,472,251],[[722,2,22]]],[0,23,12,0,0,0,0,0,[1,723,0],[]],[0,59,25,0,26,0,0,0,[1,725,3],[[728,2,27]]],[0,28,25,0,29,0,0,0,[1,729,2],[[731,2,60]]],[0,31,0,0,0,0,0,0,[1,732,10],[[0,32,0,0,0,0,33,0,[1,735,5],[[0,34,12,0,35,0,0,0,[1,736,0],[]],[0,36,25,0,37,0,33,0,[1,737,2],[[738,2,38],[739,2,39]]],[8,0,0,0,0,33,0,0,[1,739,0],[]],[740,2,39]]],[0,40,25,0,41,0,0,0,[1,741,1],[[741,2,42],[742,2,43]]],[8,0,0,0,0,33,0,0,[1,742,0],[]]]],[0,44,0,0,0,0,45,0,[1,743,12],[[0,32,0,0,0,0,33,0,[1,747,5],[[0,34,12,0,35,0,0,0,[1,748,0],[]],[0,36,25,0,37,0,33,0,[1,749,2],[[751,2,61],[751,2,47]]],[8,0,0,0,0,33,0,0,[1,751,0],[]],[752,2,47]]],[0,40,25,0,41,0,0,0,[1,753,1],[[754,2,62],[754,2,49]]],[8,0,0,0,0,33,0,0,[1,754,0],[]],[755,2,50]]],[0,63,25,0,41,0,0,0,[1,755,2],[[757,2,64],[758,2,65]]],[0,54,12,0,0,0,0,0,[1,758,0],[]],[2,55,12,0,56,0,0,0,[1,760,8],[]]]],[66,0,67,[10],[1,769,707],[[0,11,12,0,13,14,15,0,[1,770,2],[[771,2,16],[771,2,17]]],[0,18,19,0,20,21,0,0,[1,772,251],[[1023,2,22]]],[0,23,12,0,0,0,0,0,[1,1024,1],[]],[0,28,25,0,29,0,0,0,[1,1025,2],[[1027,2,60]]],[0,31,0,0,0,0,0,0,[1,1029,10],[[0,32,0,0,0,0,33,0,[1,1032,5],[[0,34,12,0,35,0,0,0,[1,1033,0],[]],[0,36,25,0,37,0,33,0,[1,1034,2],[[1035,2,38],[1036,2,39]]],[8,0,0,0,0,33,0,0,[1,1036,0],[]],[1037,2,39]]],[0,40,25,0,41,0,0,0,[1,1037,1],[[1038,2,42],[1038,2,43]]],[8,0,0,0,0,33,0,0,[1,1039,0],[]]]],[0,44,0,0,0,0,0,0,[1,1040,13],[[0,32,0,0,0,0,33,0,[1,1044,6],[[0,34,12,0,35,0,0,0,[1,1045,0],[]],[0,36,25,0,37,0,33,0,[1,1047,2],[[1048,2,61],[1049,2,47]]],[8,0,0,0,0,33,0,0,[1,1049,0],[]],[1050,2,47]]],[0,40,25,0,41,0,0,0,[1,1050,1],[[1051,2,62],[1051,2,49]]],[8,0,0,0,0,33,0,0,[1,1052,0],[]]]],[0,68,25,0,29,0,0,0,[1,1053,2],[[1055,2,69]]],[0,70,0,0,0,0,0,0,[1,1056,13],[[0,32,0,0,0,0,33,0,[1,1057,7],[[0,34,12,0,35,0,0,0,[1,1057,0],[]],[0,36,25,0,37,0,33,0,[1,1058,3],[[1061,2,71],[1062,2,72]]],[8,0,0,0,0,33,0,0,[1,1062,0],[]],[1063,2,72]]],[0,73,25,0,41,0,0,0,[1,1064,4],[[1067,2,74],[1068,2,75]]],[8,0,0,0,0,33,0,0,[1,1068,0],[]]]],[0,76,25,0,29,0,0,0,[1,1069,3],[[1072,2,77]]],[0,70,0,0,0,0,0,0,[1,1073,8],[[0,32,0,0,0,0,33,0,[1,1074,4],[[0,34,12,0,35,0,0,0,[1,1074,0],[]],[0,36,25,0,37,0,33,0,[1,1075,2],[[1076,2,78],[1077,2,79]]],[8,0,0,0,0,33,0,0,[1,1077,0],[]],[1077,2,79]]],[0,73,25,0,41,0,0,0,[1,1078,2],[[1080,2,80],[1080,2,81]]],[8,0,0,0,0,33,0,0,[1,1080,0],[]]]],[0,82,19,0,83,84,0,0,[1,1081,0],[]],[0,34,12,0,35,85,0,0,[1,1082,379],[]],[0,36,25,0,37,0,33,0,[1,1462,2],[[1463,2,86],[1464,2,87]]],[0,34,12,0,35,85,0,0,[1,1464,1],[]],[0,36,25,0,37,0,33,0,[1,1466,2],[[1468,2,88],[1468,2,87]]],[2,55,12,0,56,0,0,0,[1,1469,7],[]]]]],[],[3,3,0,0]]],[],[],[3,3,0,0]];
+window.output["suite"] = [1,2,3,0,[],[1,0,1440],[[4,5,6,7,[],[1,39,1398],[],[[8,0,9,[10],[1,114,306],[[0,11,12,0,13,14,15,0,[1,116,2],[[118,2,16]]],[0,17,18,0,19,20,0,0,[1,119,251],[[370,2,21]]],[0,22,12,0,23,0,0,0,[1,371,0],[]],[0,24,25,0,26,0,0,0,[1,372,4],[]],[0,27,25,0,28,0,0,0,[1,377,3],[[380,2,29]]],[0,30,0,0,0,0,0,0,[1,382,13],[[0,31,0,0,0,0,32,0,[1,385,7],[[0,33,12,0,34,0,0,0,[1,386,0],[]],[0,35,25,0,36,0,32,0,[1,387,4],[[391,2,37],[391,2,38]]],[8,0,0,0,0,32,0,0,[1,391,0],[]],[392,2,38]]],[0,39,25,0,40,0,0,0,[1,393,1],[]],[8,0,0,0,0,32,0,0,[1,394,0],[]]]],[0,41,0,0,0,0,42,0,[1,395,11],[[0,31,0,0,0,0,32,0,[1,399,5],[[0,33,12,0,34,0,0,0,[1,400,0],[]],[0,35,25,0,36,0,32,0,[1,401,2],[[402,2,43],[403,2,44]]],[8,0,0,0,0,32,0,0,[1,403,0],[]],[404,2,44]]],[0,39,25,0,40,0,0,0,[1,404,1],[]],[8,0,0,0,0,32,0,0,[1,405,0],[]],[406,2,45]]],[0,46,25,0,40,0,0,0,[1,407,3],[]],[0,47,12,0,48,0,0,0,[1,410,0],[]],[2,49,12,0,50,0,0,0,[1,412,8],[]]]],[51,0,52,[10],[1,421,301],[[0,11,12,0,13,14,15,0,[1,422,2],[[424,2,53]]],[0,17,18,0,19,20,0,0,[1,425,251],[[675,2,21]]],[0,22,12,0,23,0,0,0,[1,676,0],[]],[0,54,25,0,26,0,0,0,[1,678,3],[]],[0,27,25,0,28,0,0,0,[1,682,3],[[684,2,55]]],[0,30,0,0,0,0,0,0,[1,685,10],[[0,31,0,0,0,0,32,0,[1,688,5],[[0,33,12,0,34,0,0,0,[1,689,0],[]],[0,35,25,0,36,0,32,0,[1,690,2],[[692,2,37],[692,2,38]]],[8,0,0,0,0,32,0,0,[1,692,0],[]],[693,2,38]]],[0,39,25,0,40,0,0,0,[1,694,1],[]],[8,0,0,0,0,32,0,0,[1,695,0],[]]]],[0,41,0,0,0,0,42,0,[1,696,11],[[0,31,0,0,0,0,32,0,[1,700,6],[[0,33,12,0,34,0,0,0,[1,701,0],[]],[0,35,25,0,36,0,32,0,[1,702,2],[[704,2,56],[704,2,44]]],[8,0,0,0,0,32,0,0,[1,704,0],[]],[705,2,44]]],[0,39,25,0,40,0,0,0,[1,706,1],[]],[8,0,0,0,0,32,0,0,[1,707,0],[]],[707,2,45]]],[0,57,25,0,40,0,0,0,[1,708,2],[]],[0,47,12,0,48,0,0,0,[1,711,1],[]],[2,49,12,0,50,0,0,0,[1,713,9],[]]]],[58,0,59,[10],[1,723,712],[[0,11,12,0,13,14,15,0,[1,724,2],[[726,2,60]]],[0,17,18,0,19,20,0,0,[1,727,251],[[978,2,21]]],[0,22,12,0,23,0,0,0,[1,979,0],[]],[0,27,25,0,28,0,0,0,[1,980,3],[[982,2,55]]],[0,30,0,0,0,0,0,0,[1,984,11],[[0,31,0,0,0,0,32,0,[1,988,5],[[0,33,12,0,34,0,0,0,[1,989,0],[]],[0,35,25,0,36,0,32,0,[1,990,2],[[991,2,37],[992,2,38]]],[8,0,0,0,0,32,0,0,[1,992,0],[]],[993,2,38]]],[0,39,25,0,40,0,0,0,[1,994,1],[]],[8,0,0,0,0,32,0,0,[1,995,0],[]]]],[0,41,0,0,0,0,0,0,[1,996,11],[[0,31,0,0,0,0,32,0,[1,999,6],[[0,33,12,0,34,0,0,0,[1,1000,1],[]],[0,35,25,0,36,0,32,0,[1,1002,3],[[1004,2,56],[1005,2,44]]],[8,0,0,0,0,32,0,0,[1,1005,0],[]],[1005,2,44]]],[0,39,25,0,40,0,0,0,[1,1006,1],[]],[8,0,0,0,0,32,0,0,[1,1007,0],[]]]],[0,61,25,0,28,0,0,0,[1,1008,2],[[1009,2,62]]],[0,63,0,0,0,0,0,0,[1,1010,13],[[0,31,0,0,0,0,32,0,[1,1011,8],[[0,33,12,0,34,0,0,0,[1,1012,0],[]],[0,35,25,0,36,0,32,0,[1,1013,4],[[1016,2,64],[1017,2,65]]],[8,0,0,0,0,32,0,0,[1,1017,0],[]],[1019,2,65]]],[0,66,25,0,40,0,0,0,[1,1020,2],[]],[8,0,0,0,0,32,0,0,[1,1022,0],[]]]],[0,67,25,0,28,0,0,0,[1,1024,3],[[1026,2,68]]],[0,63,0,0,0,0,0,0,[1,1027,8],[[0,31,0,0,0,0,32,0,[1,1028,4],[[0,33,12,0,34,0,0,0,[1,1029,0],[]],[0,35,25,0,36,0,32,0,[1,1030,2],[[1031,2,69],[1031,2,70]]],[8,0,0,0,0,32,0,0,[1,1031,0],[]],[1032,2,70]]],[0,66,25,0,40,0,0,0,[1,1032,2],[]],[8,0,0,0,0,32,0,0,[1,1035,0],[]]]],[0,71,18,0,72,73,0,0,[1,1036,1],[]],[0,33,12,0,34,74,0,0,[1,1037,379],[]],[0,75,25,0,36,0,32,0,[1,1416,2],[[1418,2,76],[1418,2,77]]],[0,33,12,0,34,74,0,0,[1,1419,0],[]],[0,78,25,0,36,0,32,0,[1,1420,2],[[1422,2,79],[1422,2,77]]],[2,49,12,0,50,0,0,0,[1,1423,11],[]]]]],[],[3,3,0,0]]],[],[],[3,3,0,0]];
 </script>
 <script type="text/javascript">
 window.output["strings"] = [];
 </script>
 <script type="text/javascript">
-window.output["strings"] = window.output["strings"].concat(["*","*Nfc Nci","*/home/franz/projects/robotframework-construct/atests/nfc_nci","*../nfc_nci","*Nfc Basic","*/home/franz/projects/robotframework-construct/atests/nfc_nci/nfc_basic.robot","*../nfc_nci/nfc_basic.robot","*<p>This is a simple example for a robot file using robotframework-construct using nfc/nci as an example using UART.\x3c/p>","*Reset NFC Reseting RF configuration","*<p>This test case resets the NFC options using NCI over UART reseting the RF configuration.\x3c/p>","*hardware","*Open Nci Connection Via Uart","*nci_interface","*<p>Opens a connection to a NCI device via UART.\x3c/p>","*${NCI_INTERFACE}    ${BAUD_RATE}","*${NCI_READ}    ${NCI_WRITE}","*${NCI_READ} = &lt;_io.FileIO name=5 mode='rb' closefd=False&gt;","*${NCI_WRITE} = &lt;_io.FileIO name=5 mode='wb' closefd=False&gt;","*Sleep","*BuiltIn","*<p>Pauses the test executed for the given time.\x3c/p>","*0.25","*Slept 250 milliseconds.","*Empty Nci Connection Receive Buffer","*Modify the element located at 'payload.ResetType' of '${NFC_RST_CMD}' to '${CORE_RESET_CMD.RESET_CONFIGURATION}'","*robotframework_construct","*<p>Modifies the element located at locator in constructDict to the value value.\x3c/p>","eNqNkE8LgkAQxb/K3iZBIq/dylT2kMqqZ9ncSSPdFd0IEb97q/TnVHSaYR6/x7wnsC9QiossiVYEWj7Uigsg6kxghAq5wA62ZIRjaoYnbw2VGkvsEt0ZaC3xvnJsAq6SulN1zIsralc1DZcCLCPEe9+AG7MF9PDVYtbdiHkLwvzsiUR/IDnzEi8Fa7Lf7+c1ylJXBnU+xyUFwx51OrT4M8zimLtR6NMgY7uURuHLX8xVGfgEMMEDARdj7A==","*Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_WRITE}'","*<p>Writes binary data to a file or sends it over a socket.\x3c/p>","eNqNkE1rg0AQhu/5FYOHbIRQtPRkTqnVIG1VNpuzrN2Nka67oiNFgv+9a3oJCS0dBoZ54X3moxxqhQE8euDZ9OdccUCDXIE5whOUI8rehaGvdQXOUuEmNE1bKykgDZMizFJGs7ci34avEVtWuHHg2JkGAmdxJifJhexIAGeyS15sjfTQJBplJbs9dhb5oOXXylsDCTMaEXe9gKsg7+xXjz97jMbOqJx/fEq0azVciztG9o/BBY32Ebuz5s+xtXo3Ko0PszpZmbRcCAuzfUnIjzAqw8XlZCp7iWxs5Z9HXEbPf4yT3YFuWZKlxJ2uWIWSusKThfiTA99J1ntl","*Expect Response from ${NCI_READ} of type ${MT.ControlPacketResponse}","*Receive message from NCI from ${NCI_READ}","*${RESPONSE}","*Wait For Data From Nci","*<p>Waits for data from the NCI device.\x3c/p>","*Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'","*<p>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.\x3c/p>","eNp1j8FqwzAMhu97Cp/KdkvHTi07dGk6Stc4OO6uRsyKa+bYxnYOe/u5pSTZxoQQSN/Hb+whRJQrUjqbQFsMK3JHcp0RJAby/Adc6sgzuEc79A9XHpxp4OMTE8PonY1IHke3edlNMlpJuyPGCApJMTqv++0skLJqxtjulNm009+uYFVb8Zvh4cs4kMKgVemcxeX8/M932gRpiFNqyzf81Ap6mD1bl3vxjiFqZ7NYO4sjypGdVkOAlOGY9UPxIKW26nYmQ7wsC5PWpeu9Niiv+SWtOaNvotmUh4ovVFqTLriePBWkyL3M8xv7KndU","eNpTqQ5yDQ7w9wt2rVWwVXDOzytJzMxLLbJS4FIAgozUxJTUIiwSIOAbApTQSM0rzdUEyxfl5wQkJmenlgSlFhfk5xWnKhjB1QY4uSEUp+al+Kf5phYXJ6anKhjA1bh7uiAZ6B/kiiQX5BYKlEPw/dHVxgO94RoCVVGgp6cHAKZhOCc=","*Element 'header.MT' in '${RESPONSE}' should be equal to '${EXPECTED_MT}'","*<p>Checks that the element located at locator in construct is equal to expectedValue.\x3c/p>","eNp1kD0PgkAMhnd/RTd0U0cTB0U0xgCGA1fSeAWJ2CN3x+C/9/wIoInd2ufJ27SSzJlYVlyCVeBdCCVpD1QBnq/YYsWkFzACV28GS/gFzwpTB8bE7W3y4lrVRzxfySZkGsWGYN65x/W2l93yuAjJGCwJpp2z228GgXESDFiyzRzr+/jXzZNABOnHaPBeK5R5TVzaixNnw/Gfc4RF25o+VaSrNBN5fBisjfx9fiJtKsVOjBRTh1xkUZWtRutgl/WlNChfX3+PvQcnuGxS","*descending to 'MT' of 'Container: \n    MT = (enum) ControlPacketResponse 2\n    PBF = (enum) endOfMessage 0\n    GID = (enum) CORE 0\n    RFU = 0\n    OID = (enum) CORE_RESET 0'","*Expect Response from ${NCI_READ} of type ${MT.ControlPacketNotification}","*${RESET_NOTIFICATION}","eNp1T01vgzAMve9X+NTCLWVoU1vt0DGoUFdAKb1NQmkTaFRIUAja9u8XEAK0aVZsOX7v+aMmqmF0A54UmnDB1AYewNiNEcoUvPwBOjumBrCYaCu7x5UsE3K9Mx1JzXN+JZpLAY8jP3kNJgETNM6PrGlIwQCNnH34NmsaY3+G4eBssOkf/+Zm2D/56cCoyXcpCc1KJgp9M8T1vPzPSZiRxuw8drVacRfyU9jgjByjy3nRqv68kya6bSZB5IUZDjIvjoJwf8a7NIyjYa3V2KEmlHJRGNVlCR9fyDHuGkdDjg5LsLTUpIRnG9qm4y5KvfVkVfOS0X6KGZHi+D1Ldt7BTxeF3kKuZAVPCJB5a0AOoBU4qE/cvuh00b38APGPh8o=","eNpTqQ5yDQ7w9wt2rVWwVXDOzytJzMxLLbJS4FIAgozUxJTUIiwSIOAbApTQSM0rzdUEyxfl5wQkJmenlvjll2SmZSYnlmTm5ykYw9UHOLkhNKTmpfin+aYWFyempyoYwNW4e7ogGeof5IokF+QWCpRD8P3R1cYDveIaAlKhp6cHAP0iOPA=","eNp1kNFrgzAQxt/3V9xb9M11g7FBHzanRUa1pPatIDdz2lCXFBPZ9t8vcxKlsIODJN/vPr6LIFOTElK1YDWwE6GgnoFugMVaWZSK+ie4AVd/GqzhWvitbemEgNTwEY56r7sd1meyubaykTVaqRXceX73ks4DLkDRbMkYbAkiz2yy14VpwZOFxtOD0+Z7cc1WPNkn5URc8LvTKKqOVGtPDnxcPv+zEic0LrN3DQZ1VvpThbDyjJtrZDv043p7i3Yw80AeZxVPq7jI02xz4M9lVuRTrFvvcEEx/v4a3hkcv6KV63vX0XSO3hgEVlvs4CFkP8rfeHs=","*descending to 'MT' of 'Container: \n    MT = (enum) ControlPacketNotification 3\n    PBF = (enum) endOfMessage 0\n    GID = (enum) CORE 0\n    RFU = 0\n    OID = (enum) CORE_RESET 0'","eNpTqQ5yDXYNiffzD/F083R2DPH096tVsFVwzs8rSczMSy2yUuBSAIKM1MSU1CIsEiDgGwKU0EjNK83VBMsX5ecEJCZnp5b45ZdkpmUmJ5Zk5ucpGMPVBzi5ITSk5qX4p/mmFhcnpqcqGMDVuHu6IBnqH+SKJBfkFgqUQ/D90dXGgz0FUqGnpwcAlLE76g==","*Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NCI_RF_CONFIGURATION_RESET}'","eNp1UF1rgzAUfd+vuG/RN9cNxgZ92JwWGTUltW8DuTNXG+qSopF2/36ZSJTCLlxIcj44J5L6irRUugFrgJ3xpzUoGZgaWGy0RaWpe4E7cHMklNTBGm6Bv9kWDghID9/hiHem3WF1Ipsbq2pVoVVGw4Pn797SWeAS8HpLfY8NQeQ5m+x9YcpFssBEenDYfOe33FIk+6SYGFOvsiXd2KMjPi+f/6kkCHuX2bsGgz5pc9EhrDzH6WrVDN1Yb2/RDv0syOOsFGkZ8zzNNgfxWmQ8n2Lde4czyvH71/DF4PMardw+uo2mc/TBILDGYgtPIfsFomh4/A==","*descending to 'ConfigurationStatus' of 'Container: \n    Reason = (enum) (unknown) 2\n    ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_RESET 1\n    padding = b' \\x02\\x04\\x00\\x02\\x00K' (total 7)'","*Nci Connection Receive Buffer Should Be Empty","*Close Nci Connection","*<p>Closes the NCI connection by closing the serial connection.\x3c/p>","*Reset NFC keeping RF configuration","*<p>This test case resets the NFC options using NCI over UART keeping the RF configuration.\x3c/p>","*Modify the element located at 'payload.ResetType' of '${NFC_RST_CMD}' to '${CORE_RESET_CMD.KEEP_CONFIGURATION}'","eNqNkE1rg0AQhu/5FYOHbIRQtPRkTqldg6RV2WzOstaNka67oiNFgv+9a3sJCS1dhh3mhfeZj2KoFQbw6IFnw5//lQA0KBSYEzxBMaLsXRj6WlfgLBVuQtO0tZIlJGGch2nCWfqaZ9twT/mywo0Dp840EDiLCzlLUcqOBHAhu/jFZqqHJtYoK9kdsLPIBy0/V94aSJgyStz1Aq4eeeO/evzZYzR2RmXi/UOiHasRurxjpP9onDN6oPzOmj1H1urdqCw6zupkZdKKsrQwWxeE/AijMqL8XpnJXiIfW/ln/z2l2XzGKN4d2ZbHaULc6QqVK6krPFuGPznwBcm1ewU=","eNp1T11rgzAUfd+vuE+tvgUnG23ZQ+e0iKtKat8GIW2iDdVENLLt3y8NRWVjl1w4ueec+9HSrudsDYGSmgrJuzU8gIkLp4x38PKHuMW+MITD5dC4lu9UndPzletUaVGKM9VCSXgc9flrNBm4ZFm5531PKw5o1Ozit1nTDIczDkdHw03/7LeW4PAQFndFS79rRRmpuaz0xQhX8/I/J2FOe7Pz2NUZ5FWqT+mCN2qMrxTV0NnzDprqoZ8MaRATHJEgS6N4d8TbIs5SkoR5Mdu7pYwJWRnTaQkfX8gz6ZtEd4ySJThaaVrDswtDf9Muar0JVNOKmjM7xEwocPZO8m2QhMWi0hsoO9XAEwJk3gqQdwMessC3RVvxTz9itod5","eNp1kNFrgzAQxt/3V9xb9E26wdigD5vTIqVGUvs2CDdz2lCXFI1s+++XuaJS6MFBku/3Hd9FUV+RUdo04CywI6GijoGtgcXWONSGume4A1//GqzhWvirXemFgMzwGY56Z9sCqxO53Dpd6wqdtgbuJ754TWeDD8DrHfU9NgTRxGyyt8VQLpKFJtKD1+Y7v2alSPZJeSHO+NNaVLIl07ijB5+WzzdWEoS9zzxNDQZzMvbLhLCaGO+rdTN043p7h27oZ0MeZ1KkMuZ5mm0O4qXMeC63SVEucp9RjZ+/hg8G79/RyveD7+hyjrYMAmcdtvAYsl9Pa3gr","*Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NCI_RF_CONFIGURATION_KEPT}'","eNp1kEFrhDAQhe/9FXOL3mRbKC3sobW6yLJGsu6tEKZmdMPaZNFI23/fVERloQMDSd43w3tR1FdklDYNOAvsij+tRcXA1sBiaxxqQ90z3IGvM6GiDrZwK/zVofRCQGb4DEe9s22B1YVcbp2udYVOWwP3M1+8psuAd8DrA/U9NgTRzOyyt9VSLpKVJtKT15Y7v2WlSI5JORFTLtmSadzZg0/r538iCcLee563BoO5GPtlQtjMjJ+rdTN0Y7yjQzf0y0AeZ1KkMuZ5mu1O4qXMeC73SVGufF9Rjb+/hQ8G79/RxveD72g6R3sGgbMOW3gM2S8mc3is","*descending to 'ConfigurationStatus' of 'Container: \n    Reason = (enum) (unknown) 2\n    ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_KEPT 0\n    padding = b' \\x02\\x04\\x00\\x02\\x00K' (total 7)'","*Actively poll for A cards","*<p>This test case resets the NFC options using NCI over UART.\x3c/p>","*Write Binary Data Generated From '${NFC_INIT_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_WRITE}'","eNp9T8FqwzAMvfcrRA51C2U4gV3S0+qlw2xLQpbtVAjO7KZhjl0Sha2U/PucdoeysgkJoSe9J6nsa40hBBSoDzQASkefCUCLQoPdwi2UB1TdHPquNhV4U41LZpt9rZWEmPGCJXGeJU9Fesceo3xa4dKDbWsbCL3JkeyUkKolIRzJA793OTJ9ww2qSrUv2DrJG6M+Z3QBhCVZROaLCVwYec7/5PgjxxpsrU7F+4dCd1YjjLzSSP5Z7P8sLnjM8ytmulo7Jv2FZuvXER0cTPZCSqfl6pKQM3DQVsjTx+66Dt+E7tWpv/midAwyXAwWWpkKd24gGDz4BlB1b+k=","*Expect Status OK response from ${NCI_READ}","eNqdlF9vmzAQwN/3KfzUpm9Amm5qtYeEPwlqgiNwNlWaZLlwpKhgM2O2dp9+hqQJNEmnxZLF4fvd+e50vpLJCpJbZAuuWMZB3qJPSK8nYAlI9PVA0awF0YoB8Lq4avVS5EsWP4MKoSoFrwBZO3Y58fYw8ASnC6gqtgZk7Jip73Qc4tDt6EJvpXX7f/yepX7gE2S2QMlec8ESmgNfqyfNmZ+75yfSiRRTdbX3GpExWUUU33euDTzbph5oUEJ1wk8bXqxAUeMD4lhSb8vJqlj8Aqlt02xdS6YywQuRQCc4P5jOHZc6sw/sPQk/a+Dxa8/R3knoUcePbPzNDam9cGi0Wi5xSFxnW8d+NuaZ2Yx9h07GkevQEK+IjvsotQwxwTaeH6DmAUpcexbgOZ4+/APexG2dGXf03Sf2jGLPo00ruJ3y7Co4qPkzF7/51RH7yZgQN3w4z8Em9OF/hh7Uhc8VyJTFbXvuyxHVZSmkgqSnn2eVOuV/tHe7YC90LtZZzHKqcQ5x00dV7+qGCUWtMr6mhD3mQKPsT9OwNyPrSx/bzgraDAs9AfR381y3Bn24OaSpkHTOZMtKVoBO4f3tvNZJNc+StpPBGo2OKSWtSoizNItpxlOhwcfLHy/GUG9Tb6uRL9FACcVydH2F6krngy5ydWeLosxySFBg+9TGAQl1ry7H9r1LLtbqDqVSFOjaQIaJTBMZrWDctEIrD61GSNO3k408bDGtGv4FCLRwNA==","eNpTqQ5yDQ7w9wt2rVWwVXDOzytJzMxLLbJS4FIAgozUxJTUIiwSIOAbApTQSM0rzdUEyxfl5wQkJmenlgSlFhfk5xWnKhjB1QY4uSEUp+al+Kf5phYXJ6anKhjA1bh7uiAZ6B/kiiQX5BYKlEPw/dHVxnv6eYYoGIIVFCTq6ekBAKV4ODo=","*Element 'payload.Status' in '${RESPONSE}' should be equal to '${GENERIC_STATUS_CODE.STATUS_OK}'","eNqdlG1v2jAQx9/vU/hd4B3QsU2T9gLyANECRolZVanSyU0uNGqwmeNsbT/9nMBIQqHTsGTl4X73vzvrfAkWMYokExuiJbF2/CWXPLGITIllS6F5JlB9JR+IWY/IE1TkGzk1VGvBjKGHotz2a7uS+YrHT6hDLHZSFEhGR3Y19RrYRKfpAouCb5AMjszMd1qCNHRbttBbG1vzTU9Z8Jc+I8MaOJQEOYqNfjTc8HP7/4VyIs11WTSqEZuwdQT0eyvs0rNt8NCACosLOnV6sUYNg3eIc0X9XU5WxPIXKuObZptScZ1JsZUJtpLzl7PAccGZv+PvKfxZoohfOkKNSOiB40c2/eGGYC8ciNarFQ2Z6xzOsVvN8MpqJr4D00nkOhDSNTN5n6VWIWXUpsEbdPgGZa49X9KAzu7+Ae/zHl2Zd3TrM3sO1POgagW3dTzHE+yV4knI36J/xn86YcwN764T2Kd+85+pL8utLzSqlMd1ezbHEZW7nVQak449yAp9SX/cyC74MwRyk8U8B4MLjKs+KjqhKyaUpTZjBRh/yBGi7LVq2E/j0ZcudpgVUA0LMwHMc39dDw5duPoJqVQQcFWzim/RlHAaXZSmqOpaQj0ZRuPxOaOCYodxlmYxZCKVBnyw7p8HN2YPzR5V7xbpaal5Tj72rT84I1zD","eNqVk11r2zAUhu/3K3Tn5C5JlzEKu0j90Zi5UbCUjULhoMrHQdSRMlnu2v36SjFrPrqWRSAs9D7nnFfyUYWtRF0pvSbOkIg54bo2IqYmUWy0E0qjvSSfiB+9Rr6RAepuMySMz/iKAf1ORjt9kcUxZOghiwE7jQ+DSocORu+oYZTZyqujo71EtdI8ovUxtVp3Vjhl9MZUeGAmX1wXSQrJ/J3YzOKvDrV8PkqyT1BmkOQspj/SEuKbBNhquaQlTxMyPnE/PtP9LE/gasbSBEq64t7nG2JZUk5jWrzBxkcYT+P5ghb0+vYDsPc4OdMj+5nzeA40yyD81vTg+K83NOj0gza/9fAk9mrGeVrenh/cW734T6uLbpNrh7YWctde/ZFZt90a67A60grVun/lnPapbsQTFGatpGjAYxpl6IX2tVTQS9M5/yqAi/sGgak/odm+TCdf90ioYE0DSyEfxBr997kxovoL78GwAbWxUAi746zYoLd7WFF33nx4OpCHa5tMp6eChXaLUtVKgtK18dB9dPc0uvBz7OckrCMycMaJhnweRi8ulBHm","*Write Binary Data Generated From '${NCI_DISCVER_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_WRITE}'","eNrVlF1rwjAUhu/9FQcvrIKMtGXF6ZXWdpT1C9t5M0aIbayymriaboj43xerF35ssqsxQ0nhTd/zPoccOinnueiCpgLSAaWADEAIkAZIrfb9Y+z2TqV3KqVJQHBBcuBTUA2YrAVdtaBczVkG9UYueiZfLOc5TcE3HWwGfjwKXBz2zScrbmSiV4dpwRfQrdc2yoySlBZKFzbKozOUb4uVC4cJmtEiEoUsecfoZ1NtgzKylVa7BkdL8eKrDpMzUfA8JMkbFRJqQVh6USO4EqtXsXjoRGYwtkYX3nBgSy86U0f2807dSllZknXOSVo16O8jiilJ6EoqxqlvHzVfJfyDFtgjS/nJy+ZEtAv6XlKWrOWRdub+du3cMU1mjOc8W2PZP/Z4Sn9sGMmGfdvEfXldUeSMLRwGrou9YGgpre0vEv+YVz3wDm6EVzvw2jfCaxx41XvjQb+VmdA6F1PsOlFs+f+YWUcXk3HK/Hr8O8E5ZZmYyXKqvq3DF8RbgtQ=","eNp1zz1vwjAQgOG9v+ImVDYHOoEYqCFVxIcjx7BaFj5CVMeObGfg32MYklZVb/Bw7yNL1ykfUC+AOhtVY9Ev4A3S3FBp9LD6E55zECm8o+3b6at7Z0p1+cbIMXTOBoTZYMvPfMRoNbseMARVI5DBfBWb0fAcsqHw/JTKKNlvKTdFRdl5y2H+Ip26G6e0NGjreEsy+7n+55oqqtiH8dtKrMWpkmwHBPrQ2BomJi6pa7vGoIYjLSRlR8HZXpZrutuKSR2XcPWuhY8MyBxIeskDZNxe/w==","eNpTqQ5yDQ7w9wt2rVWwVXDOzytJzMxLLbJS4FIAgozUxJTUIiwSIOAbApTQSM0rzdUEyxfl5wQkJmenlgSlFhfk5xWnKhjB1QY4uSEUp+al+Kf5phYXJ6anKhjA1bh7uiDUBLkpGMJlgtxCgTIIlf6oKuNdPIOd/cNcgxSMwUoKEvX09ACfPjhG","eNp1zz0PgjAQgOHdX3EbuoFuJg6KYoghJS24koYeHxFbQsvgv7cSQ9XEG/s+ueYE6hKlaGUNRoHX80enuPBAVeCFShreShy2sAA7DXKBA+zgN7wmyWxYohzvq6kPqkt5eUNDUfdKaoT1bNND5LD9nVQJas1rBH825/joDI0gmAuNclucJN+yOMYsJNcThc1E3icVHcraNFYGn89/rmGGm1G7tSzbZzkryAV87wmO6VR6","*descending to 'Status' of 'Container: \n    Status = (enum) STATUS_OK 0'","*Log To Console","*<p>Logs the given message to the console.\x3c/p>","*please place a card on the reader","*timeout=1","eNp1kF1rgzAUhu/3K85VP+4SdaNr2cWa1iFbVZzbxRAk1mjDYiIxhe7fL0rRjbEDCe857/OSj5bqjpVrIEoayiXTa7gBWydGS6bh4Y/R1yG1xoLJc7McfK1ETI+fzITK8IofqeFKgjvy8dafAkyWUXVgXUdrBmhknoLdxCQ+4NFJ/DfrTGT0m8x3wSuJ3vfJ9cCWfglFy1wwWZuTJbH3c/7Pk8Jzk1JdM9P1ienmY6iYZxfk2YUyY3dnUHay/cguxera4V44c1gYZagA7C7h3HFZw0yYDVFNywUrISRBTqIwTaKXPH4kz/t0VpsNVFo1cIcBuYDsz1jhAUKA7gE5g/DAc+CWQrEaWgyuFc43mDN5Vw==","eNpTqQ5yDQ7w9wt2rVWwVXDOzytJzMxLLbJS4FIAgozUxJTUIiwSIOAbApTQSM0rzdUEyxfl5wQkJmenlvjll2SmZSYnlmTm5ykYw9UHOLkhNKTmpfin+aYWFyempyoYwNW4e7og1AS5KRjCZYLcQoEyCJX+qCrjXTyDnf3DXIPAFurp6QEA9TM4zg==","eNp1j9tqg0AQhu/7FHNRcrjbNWJDQqGtSUpoo8HaXgky0dFIdTfoBuzbdwxBW0qX/Qd2v2/2cMK6oXQBrlYGC0X1Am6Ax5EwpRru/4Bu7EIGE1LnanrhtS73mHyS8bQpsiJBU2gFs97fP22GBlKpn+2oaTAnEL3zvF0NTrAB2ZNg885kMP3fZrzavrn+xzq4XnjCr1JjGpekcnNkU9793P/nS965CrHOyTQsWMPL+6bDOGqFc03CERzrIWoTilqUUSvn2S1XxsQIDxy708YwMdpgCdKZwrkpVA6j0ixdXZ2KklLw3G3s+l4Y+K/x/tF9WYej3Cwhq3UFjgQxA8nVAuFcZgJCdEtbQEKAEuQcHAcsm88HEoAHQJudb8VxgUo="]);
+window.output["strings"] = window.output["strings"].concat(["*","*Nfc","*/home/franz/projects/robotframework-construct/atests/nfc","*../../nfc","*Nfc Basic","*/home/franz/projects/robotframework-construct/atests/nfc/nfc_basic.robot","*../../nfc/nfc_basic.robot","*<p>This is a simple example for a robot file using robotframework-construct using nfc/nfc as an example using UART.\x3c/p>","*Reset NFC Reseting RF configuration","*<p>This test case resets the NFC options using nfc over UART reseting the RF configuration.\x3c/p>","*hardware","*Open Nfc Connection Via Uart","*nfc_interface","*<p>Opens a connection to a NFC device via UART.\x3c/p>","*${NFC_INTERFACE}    ${BAUD_RATE}","*${NFC_INTERFACE}","*${NFC_INTERFACE} = timeoutExceptionOnTimeoutSerial&lt;id=0x7b2d54075a50, open=True&gt;(port='/dev/serial/by-id/usb-STMicroelectronics_STM32_STLink_066EFF3031454D3043225321-if02', baudrate=115200, bytesize=8, parity='N', stopb...","*Sleep","*BuiltIn","*<p>Pauses the test executed for the given time.\x3c/p>","*0.25","*Slept 250 milliseconds.","*Empty Nfc Connection Receive Buffer","*<p>Empties the receive buffer.\x3c/p>","*Modify the element located at 'payload.ResetType' of '${NFC_RST_CMD}' to '${CORE_RESET_CMD.RESET_CONFIGURATION}'","*robotframework_construct","*<p>Modifies the element located at locator in constructDict to the value value.\x3c/p>","*Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${nfcControlPacket}' To '${NFC_INTERFACE}'","*<p>Writes binary data to a file or sends it over a socket.\x3c/p>","eNqNkE1rg0AQhu/5FYOHbIRQtPRkTqnVIG1VNpuzrN2Jka67oitFgv+9a3oJCS0dBoZ54X3moxxqaQJ49MCz6c+54mC04RL0EZ6gHA32Lgx9rSpwltJsQt20tUQBaRwWYZYymr0V+TZ8jdiyMhsHjp1uIHAWZ3JCLrAjAZzJLnmxNVJDkyiDFXZ701nkg8KvlbcGEmY0Iu56AVdB3tmvHn/2aGU6LXP+8YnGrtVwJe4Y2T8GFzTaR+zOmj/H1urdqDQ+zOpkZdJyISzM9iUhP8IoNReXkyn2aNjY4p9HXEbPf4yT3YFuWZKlxJ2uWIVEVZmThfiTA99FgHti","*Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketResponse}","*Receive message from nfc from ${nfc_INTERFACE}","*${RESPONSE}","*Wait For Data From Nfc","*<p>Waits for data from the NFC device.\x3c/p>","*Parse '${nfc_INTERFACE}' Using Construct '${nfcControlPacket}'","*<p>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.\x3c/p>","eNp1j8FOwzAMhu88hU8T3DrEaROHEVqExpoqzbhGEXGziDSpkvTA25NNU1tAWJYl+/v0RxlkiKg2QLxL0jgMG7iBXCeUCgM8/gHnOvAMbtGN/d2FB28b+fGJiWEcvIsI95PbPFWzjE7R7oAxSo1QTM7L6/MikLJywVh1zGze6W9XsLIt+dUY5Jf1UgmLTqdTFtfL8z/faZNMY5xTW77jx1bQ/eLZuiLiHUM03mWx9g4nlCM7o8cgU4ZT1g9lkEoZp69nGON5Wdm0Jb4fjEV1ySe05oy+iWZH9iVf6bSFLvgeHgoocq/z/Ab5MndO","eNpTqQ5yDQ7w9wt2rVWwVXDOzytJzMxLLbJS4FIAgozUxJTUIiwSIOAbApTQSM0rzdUEyxfl5wQkJmenlgSlFhfk5xWnKhjB1QY4uSEUp+al+Kf5phYXJ6anKhjA1bh7uiAZ6B/kiiQX5BYKlEPw/dHVxgO94RoCVVGgp6cHAKZhOCc=","*Element 'header.MT' in '${RESPONSE}' should be equal to '${EXPECTED_MT}'","*<p>Checks that the element located at locator in construct is equal to expectedValue.\x3c/p>","*Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketNotification}","*${RESET_NOTIFICATION}","eNp1T01vgzAMve9X+NTCLWVoU1vt0DGoUFdAKb1NQmkTaFRIUAja9u8XEAK0aVZsOX7v+aMmqmF0A54UmnDB1AYewNiNEcoUvPwBOjumBrCYaCu7x5UsE3K9Mx1JzXN+JZpLAY8jP3kNJgETNM6PrGlIwQCNnH34NmsaY3+G4eBssOkf/+Zm2D/56cCoyXcpCc1KJgp9M8T1vPzPSZiRxuw8drVacRfyU9jgjByjy3nRqv68kya6bSZBFHgZDjIvjoJwf8a7NIyjYa3V2KEmlHJRGNVlCR9fyDHuGkdDjg5LsLTUpIRnG9qm4y5KvfVkVfOS0X6KGZHi+D1Ldt7BTxeF3kKuZAVPCJB5a0AOoBU4qE/cvuh00b38AO71h8Q=","eNpTqQ5yDQ7w9wt2rVWwVXDOzytJzMxLLbJS4FIAgozUxJTUIiwSIOAbApTQSM0rzdUEyxfl5wQkJmenlvjll2SmZSYnlmTm5ykYw9UHOLkhNKTmpfin+aYWFyempyoYwNW4e7ogGeof5IokF+QWCpRD8P3R1cYDveIaAlKhp6cHAP0iOPA=","eNpTqQ5yDXYNiffzD/F083R2DPH096tVsFVwzs8rSczMSy2yUuBSAIKM1MSU1CIsEiDgGwKU0EjNK83VBMsX5ecEJCZnp5b45ZdkpmUmJ5Zk5ucpGMPVBzi5ITSk5qX4p/mmFhcnpqcqGMDVuHu6IBnqH+SKJBfkFgqUQ/D90dXGgz0FUqGnpwcAlLE76g==","*Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NFC_RF_CONFIGURATION_RESET}'","*Nfc Connection Receive Buffer Should Be Empty","*<p>Verifies that the receive buffer is empty.\x3c/p>","*Close Nfc Connection","*<p>Closes the NFC connection by closing the serial connection.\x3c/p>","*Reset NFC keeping RF configuration","*<p>This test case resets the NFC options using nfc over UART keeping the RF configuration.\x3c/p>","*${NFC_INTERFACE} = timeoutExceptionOnTimeoutSerial&lt;id=0x7b2d537f38b0, open=True&gt;(port='/dev/serial/by-id/usb-STMicroelectronics_STM32_STLink_066EFF3031454D3043225321-if02', baudrate=115200, bytesize=8, parity='N', stopb...","*Modify the element located at 'payload.ResetType' of '${NFC_RST_CMD}' to '${CORE_RESET_CMD.KEEP_CONFIGURATION}'","eNqNkE1rg0AQhu/5FYOHbIRQtPRkTqldg6RV2WzOstaJka67oitFgv+9a3sJCS1dhh3mhfeZj2KopQng0QPPhj//KwFGGyFBn+AJitFg78LQ16oCZynNJtRNW0ssIYnCPEwTztLXPNuGe8qXldk4cOp0A4GzuJAzihI7EsCF7OIXm6kamlgZrLA7mM4iHxR+rrw1kDBllLjrBVw98sZ/9fizRyvTaZmJ9w80dqxGqPKOkf6jcc7ogfI7a/YcWat3o7LoOKuTlUkrytLCbF0Q8iOMUovye2WGPRo+tvhn/z2l2XzGKN4d2ZbHaULc6QqVS1SVOVuGPznwBcViewI=","eNp1T11rgzAUfd+vuE+tvgUnG23ZQ+e0iKtKmr4NJG2iDY2JaGTbv18qRWVjl1w4ueec+9HQtuNsDYFWhgrF2zU8gI0Lp4y38PKHuMWeWMLhqq/dgW+1zOn5yk2qjSjFmRqhFTyO+vw1mgxcsazc866jFQc0anbx26xphsMZh6Oj5aZ/9ltb4PAQkruiod9SU1ZIripzscLVvPzPSZjTzu48dnV6dVX6U7ngjRrrK0XVt8N5B0NN302GNAoKHBVBlkbx7oi3JM7SIglzMtu7oYwJVVnTaQkfX8iz6dtEd4ySJThGGyrh2YW+u2kX0mwCXTdCcjYMsRMIzt6LfBskIVlUZgNlq2t4QoDsWwHybsBDA/CH4lDxTz9gH4dz","*Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NFC_RF_CONFIGURATION_KEPT}'","*Actively poll for A cards","*<p>This test case resets the NFC options using nfc over UART.\x3c/p>","*${NFC_INTERFACE} = timeoutExceptionOnTimeoutSerial&lt;id=0x7b2d53845870, open=True&gt;(port='/dev/serial/by-id/usb-STMicroelectronics_STM32_STLink_066EFF3031454D3043225321-if02', baudrate=115200, bytesize=8, parity='N', stopb...","*Write Binary Data Generated From '${NFC_INIT_CMD}' Using Construct '${nfcControlPacket}' To '${NFC_INTERFACE}'","eNp9T8FqwzAMvfcrRA51C2U4gV3S0+YlI2xLQpbtNAjO7KZhjl0cha2U/PucdoeysgkJoSe9J6keWoUhBBSoDzQASidfcECDXIHZwDXUe5T9Eoa+1Q14c4VrZrpdq6SANGYVy9KyyB6r/IY9ROW8wbUHG2s6CL3ZgWwlF9KSEA7kPrlzOdJDl2iUjbTPaJ3klZafC7oCwrIiIsvVDM6MPJV/cvyJYzRao3L+/iHRndVxLS40sn8W+z+LqyRNygtmfhs7Jv2FFvHLhI4OJjsuhNNydU3ICdgrw8XxY3ddj69cDfLYf/uidAoyng1WSuoGt24gGD34BkyLb+Y=","*Expect Status OK response from ${NFC_INTERFACE}","eNqdlF9vmzAQwN/3KfzUpm9Amm5qtYeEPwlqEkfgbKo0yXLhoKjEZsZs7T79DEkDNEmnxZLF4fvd+e50voLJEuJbZAuuWMZB3qJPSK8nYDFI9PVAUa8F0YoB8Gpz1eilyFcsegYVQFkIXgKy9uxq4rUw8BgnCyhLlgIy9szUdzoOceB2dIG31rr2H79nqb/0CTIboGCvuWAxzYGn6klz5ufu+Yl0QsVUVbZeQzIm65Di+861S8+2qQcalFCe8NOEFylQ1PiAOJbU23KyMhK/QGrbJEsryVQm+EbE0AnOX07njkud2Qf2noSfFfDoteeodRJ41PFDG39zA2ovHBquVyscENfZ1bGfjXlmNmPfoZNx6Do0wGui4z5KrQJMsI3nB6h5gBLXni3xHE8f/gFv47bOjDv87hN7RrHn0boV3E559hUcVPyZi9/86oj9ZEyIGzyc52Ab+vA/Q19WG58rkAmLmvZsyxFWRSGkgrinn2elOuV/1LpdsBc6F2kWsZxqnENU91HZu7pmAlGpjKeUsMccaJj9qRv2ZmR96WO7WUHrYaEngP5un+vOoA/XhzQRks6ZbFjJNqBTeH87r3RS9bOkzWSwRqNjSknLAqIsySKa8URo8PHyx4sx1NvU26rlSzRQQrEcXV+hqtT5oItc3dliU2Q5xPUIoDZekkD36mps37vkIlV3KJFig64NZJjINJHRCMZNIzTy0KqFJHk72crDBtOq4V8HuHAx","eNpTqQ5yDQ7w9wt2rVWwVXDOzytJzMxLLbJS4FIAgozUxJTUIiwSIOAbApTQSM0rzdUEyxfl5wQkJmenlgSlFhfk5xWnKhjB1QY4uSEUp+al+Kf5phYXJ6anKhjA1bh7uiAZ6B/kiiQX5BYKlEPw/dHVxnv6eYYoGIIVFCTq6ekBAKV4ODo=","*Element 'payload.Status' in '${RESPONSE}' should be equal to '${GENERIC_STATUS_CODE.STATUS_OK}'","*Write Binary Data Generated From '${NFC_DISCVER_CMD}' Using Construct '${NFCControlPacket}' To '${NFC_INTERFACE}'","eNrVlF9vgjAUxd/9FDc8iCZmKZARp0+KsJAhGGC+LEtToaIZtg7LFmP87qvog382s6dlNqRNDpx7fje9YVLOc9EBXQNkAEoBmYAQIB2QVu37x9zt7UpvV0qDgOCC5MCnoJkwWQu6akK5mrMMlHouuhZfLOc5TcF3LGwFfhwGHh71rCc7rmeiq8C04AvoKLWNOqMkpYXagY366A7kabNy4TJBM1pEopAl7xj9bGgtUENHbbZqcLTUYXzVYXEmCp6PSPJGhYRaEJZe1AiuxBpVLB64kRWM7fDCO+o70ovO1NB53qlbKatLss45SasG/X1EMSUJXUnFPPXto+arhH/QAg/JUn7ysjkRnYK+l5Qla/lKP3N/u3bumCYzxnOerbHsHw95Sn9sGMmGd5fWk9cVRe7YxqPA8/AwGNhqc/uLxD/m1Q68/Rvh1Q+8zo3wmgde7d58MG5lJvT2xRR7bhTb/j9mNtDFZJwyvx7/TnBOWSZmspxmbBX4ArQvgtE=","eNp1z7FuwjAQgOGdp7gJtZtTmEAMYEiFKDhyDKtl1UeIcOzIdoa+fQ1DAkLc4OH+T5auVT6gngF1Nqraop/BCNJcUGn0sHgJt9mLFD7Qds3nvXtnCvV7xcgxtM4GhK/eFqt8wGg1O+8xBFUhkN58b9eD4TlkfeH5MZVBsmcp19uSstOGw+ROWvVnnNLSoK3iJcnscf3mmjKq2IXh21IsxbGUbAcEulDbCsYmzqlr2tqghkNOJWUHwdmPLJZ0txHjKs7h7F0D0wzIBEh6yT9kcF78","eNpTqQ5yDQ7w9wt2rVWwVXDOzytJzMxLLbJS4FIAgozUxJTUIiwSIOAbApTQSM0rzdUEyxfl5wQkJmenlgSlFhfk5xWnKhjB1QY4uSEUp+al+Kf5phYXJ6anKhjA1bh7uiDUBLkpGMJlgtxCgTIIlf6oKuNdPIOd/cNcgxSMwUoKEvX09ACfPjhG","*Log To Console","*<p>Logs the given message to the console.\x3c/p>","*please place a card on the reader","*timeout=1","*Parse '${NFC_INTERFACE}' Using Construct '${NFCControlPacket}'","eNp1kF1rgzAUhu/3K85VP+4SdaNr2cWa1lG2qji3iyFIrNGGxURihO7fL0rRjbEDCe857/OSj4bqlhVrIEoayiXTa7gBW2dGC6bh4Y/R1zGxxoLJrl4OvlYioqdPZgJleMlP1HAlwR35aOtPASaLsDyytqUVAzQyT4fdxMQ+4NGJ/TfrTGT4m8x2h1cSvu/j64EN/RKKFplgsjJnS2Lv5/yfJwVdnVBdMdP2ienmYyifpxfk2YVSY3dnUHay/Ugv+era4V44c1gYZagA7C6ha7msYCbMhqi64YIVEPgkI2GQxOFLFj2S530yq8wGSq1quMOAXED2Z6zwACFA94CcQXjgOXBLIV8NLQbXCucbl1J5VA==","eNpTqQ5yDQ7w9wt2rVWwVXDOzytJzMxLLbJS4FIAgozUxJTUIiwSIOAbApTQSM0rzdUEyxfl5wQkJmenlvjll2SmZSYnlmTm5ykYw9UHOLkhNKTmpfin+aYWFyempyoYwNW4e7og1AS5KRjCZYLcQoEyCJX+qCrjXTyDnf3DXIPAFurp6QEA9TM4zg==","*Parse '${NFC_INTERFACE}' Using Construct '${nfcControlPacket}'","eNp1j9tqg0AQhu/7FHNRcrjbNWJDQqGtiSW00WBtrwSZ6Gikuht0A/btOwlBW0qX/Qd2v2/2cMSmpWwBrlYGS0XNAm6Ax4Ewowbu/4Dz2EYMJqRO9fTCG13tMP0k42tT5mWKptQKZr2/e/KGBlJZkG+pbbEgEL3zvFkNTuiB7EnovTMZzOC3maw2b27wsQ6vFx7xq9KYJRWpwhzYlHc/9//5kn+qI2wKMi0L1vDyvmk/jjvhXJNyBMd6iLuU4g5l3Ml5fsuVMTHCPcc+a2OYGG2wAulM4dSWqoBRZZauro9lRRn4npu4gR+FwWuye3Rf1tGoMEvIG12DI0HMQHK1QDiXmYIQ56UtICVACXIOjgOWzecDCcA9oM3ON8R1gUc="]);
 </script>
 <script type="text/javascript">
-window.output["stats"] = [[{"elapsed":"00:00:01","fail":0,"label":"All Tests","pass":3,"skip":0}],[{"elapsed":"00:00:01","fail":0,"label":"hardware","pass":3,"skip":0}],[{"elapsed":"00:00:01","fail":0,"id":"s1","label":"Nfc Nci","name":"Nfc Nci","pass":3,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s1","label":"Nfc Nci.Nfc Basic","name":"Nfc Basic","pass":3,"skip":0}]];
+window.output["stats"] = [[{"elapsed":"00:00:01","fail":0,"label":"All Tests","pass":3,"skip":0}],[{"elapsed":"00:00:01","fail":0,"label":"hardware","pass":3,"skip":0}],[{"elapsed":"00:00:01","fail":0,"id":"s1","label":"Nfc","name":"Nfc","pass":3,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s1","label":"Nfc.Nfc Basic","name":"Nfc Basic","pass":3,"skip":0}]];
 </script>
 <script type="text/javascript">
 window.output["errors"] = [];
 </script>
 <script type="text/javascript">
-window.output["baseMillis"] = 1733824849000;
+window.output["baseMillis"] = 1734518326106;
 </script>
 <script type="text/javascript">
-window.output["generated"] = 1513;
+window.output["generated"] = 1470;
 </script>
 <script type="text/javascript">
 window.output["expand_keywords"] = null;
diff --git a/atests/hw_dependant_results/nfc/output.xml b/atests/hw_dependant_results/nfc/output.xml
index 49ed415..aa1fda1 100644
--- a/atests/hw_dependant_results/nfc/output.xml
+++ b/atests/hw_dependant_results/nfc/output.xml
@@ -1,34 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<robot generator="Robot 7.1.1 (Python 3.13.0 on linux)" generated="2024-12-10T11:00:48.998425" rpa="false" schemaversion="5">
-<suite id="s1" name="Nfc Nci" source="/home/franz/projects/robotframework-construct/atests/nfc_nci">
-<suite id="s1-s1" name="Nfc Basic" source="/home/franz/projects/robotframework-construct/atests/nfc_nci/nfc_basic.robot">
-<test id="s1-s1-t1" name="Reset NFC Reseting RF configuration" line="14">
-<kw name="Open Nci Connection Via Uart" owner="nci_interface">
-<msg time="2024-12-10T11:00:49.156097" level="INFO">${NCI_READ} = &lt;_io.FileIO name=5 mode='rb' closefd=False&gt;</msg>
-<msg time="2024-12-10T11:00:49.156295" level="INFO">${NCI_WRITE} = &lt;_io.FileIO name=5 mode='wb' closefd=False&gt;</msg>
-<var>${NCI_READ}</var>
-<var>${NCI_WRITE}</var>
-<arg>${NCI_INTERFACE}</arg>
+<robot generator="Robot 7.1.1 (Python 3.13.0 on linux)" generated="2024-12-18T11:38:46.103329" rpa="false" schemaversion="5">
+<suite id="s1" name="Nfc" source="/home/franz/projects/robotframework-construct/atests/nfc">
+<suite id="s1-s1" name="Nfc Basic" source="/home/franz/projects/robotframework-construct/atests/nfc/nfc_basic.robot">
+<test id="s1-s1-t1" name="Reset NFC Reseting RF configuration" line="13">
+<kw name="Open Nfc Connection Via Uart" owner="nfc_interface">
+<msg time="2024-12-18T11:38:46.224058" level="INFO">${NFC_INTERFACE} = timeoutExceptionOnTimeoutSerial&lt;id=0x7b2d54075a50, open=True&gt;(port='/dev/serial/by-id/usb-STMicroelectronics_STM32_STLink_066EFF3031454D3043225321-if02', baudrate=115200, bytesize=8, parity='N', stopb...</msg>
+<var>${NFC_INTERFACE}</var>
+<arg>${NFC_INTERFACE}</arg>
 <arg>${BAUD_RATE}</arg>
-<doc>Opens a connection to a NCI device via UART.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.151798" elapsed="0.004551"/>
+<doc>Opens a connection to a NFC device via UART.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.221894" elapsed="0.002316"/>
 </kw>
 <kw name="Sleep" owner="BuiltIn">
-<msg time="2024-12-10T11:00:49.407562" level="INFO">Slept 250 milliseconds.</msg>
+<msg time="2024-12-18T11:38:46.476136" level="INFO">Slept 250 milliseconds.</msg>
 <arg>0.25</arg>
 <doc>Pauses the test executed for the given time.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.156803" elapsed="0.251084"/>
+<status status="PASS" start="2024-12-18T11:38:46.224941" elapsed="0.251494"/>
 </kw>
-<kw name="Empty Nci Connection Receive Buffer" owner="nci_interface">
-<status status="PASS" start="2024-12-10T11:00:49.408647" elapsed="0.000381"/>
+<kw name="Empty Nfc Connection Receive Buffer" owner="nfc_interface">
+<doc>Empties the receive buffer.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.477143" elapsed="0.000388"/>
 </kw>
 <kw name="Modify the element located at 'payload.ResetType' of '${NFC_RST_CMD}' to '${CORE_RESET_CMD.RESET_CONFIGURATION}'" owner="robotframework_construct" source_name="Modify the element located at '${locator}' of '${constructDict}' to '${value}'">
-<msg time="2024-12-10T11:00:49.413728" level="INFO">descending to 'payload' of '{'header': {'MT': EnumIntegerString.new(1, 'ControlPacketCommand'), 'PBF': 0, 'GID': EnumIntegerString.new(0, 'CORE'), 'RFU': 0, 'OID': EnumIntegerString.new(0, 'CORE_RESET')}, 'payload_length': 1, 'payload': {'ResetType': EnumIntegerString.new(1, 'RESET_CONFIGURATION')}, 'padding': b''}'</msg>
 <doc>Modifies the element located at locator in constructDict to the value value.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.409870" elapsed="0.004071"/>
+<status status="PASS" start="2024-12-18T11:38:46.478416" elapsed="0.003810"/>
 </kw>
-<kw name="Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_WRITE}'" owner="robotframework_construct" source_name="Write binary data generated from '${data}' using construct '${identifier}' to '${file}'">
-<msg time="2024-12-10T11:00:49.417695" level="INFO">built: 20 00 01 01 (a total of 4 bytes) using "&lt;Compiled NCI_CONTROL_PACKET&gt;" from :"
+<kw name="Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${nfcControlPacket}' To '${NFC_INTERFACE}'" owner="robotframework_construct" source_name="Write binary data generated from '${data}' using construct '${identifier}' to '${file}'">
+<msg time="2024-12-18T11:38:46.486245" level="INFO">built: 20 00 01 01 (a total of 4 bytes) using "&lt;Compiled NFC_CONTROL_PACKET&gt;" from :"
 {'header': {'GID': EnumIntegerString.new(0, 'CORE'),
             'MT': EnumIntegerString.new(1, 'ControlPacketCommand'),
             'OID': EnumIntegerString.new(0, 'CORE_RESET'),
@@ -38,16 +36,16 @@
  'payload': {'ResetType': EnumIntegerString.new(1, 'RESET_CONFIGURATION')},
  'payload_length': 1}" </msg>
 <doc>Writes binary data to a file or sends it over a socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.415096" elapsed="0.002929"/>
+<status status="PASS" start="2024-12-18T11:38:46.483429" elapsed="0.003196"/>
 </kw>
-<kw name="Expect Response from ${NCI_READ} of type ${MT.ControlPacketResponse}" source_name="Expect Response from ${NCI_READ} of type ${EXPECTED_MT}">
-<kw name="Receive message from NCI from ${NCI_READ}" source_name="Receive message from NCI from ${NCI_READ}">
-<kw name="Wait For Data From Nci" owner="nci_interface">
-<doc>Waits for data from the NCI device.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.423648" elapsed="0.000386"/>
+<kw name="Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketResponse}" source_name="Expect Response from ${nfc_INTERFACE} of type ${EXPECTED_MT}">
+<kw name="Receive message from nfc from ${nfc_INTERFACE}" source_name="Receive message from nfc from ${nfc_INTERFACE}">
+<kw name="Wait For Data From Nfc" owner="nfc_interface">
+<doc>Waits for data from the NFC device.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.492086" elapsed="0.000357"/>
 </kw>
-<kw name="Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
-<msg time="2024-12-10T11:00:49.426812" level="INFO">parsed: Container: 
+<kw name="Parse '${nfc_INTERFACE}' Using Construct '${nfcControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
+<msg time="2024-12-18T11:38:46.496560" level="INFO">parsed: Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -57,10 +55,10 @@
     payload_length = 1
     payload = Container: 
         Status = (enum) STATUS_OK 0
-        NCI_Version = None
+        NFC_Version = None
         ConfigurationStatus = None
-        padding = None using &lt;Compiled NCI_CONTROL_PACKET&gt; from 40 00 01 00</msg>
-<msg time="2024-12-10T11:00:49.427358" level="INFO">${RESPONSE} = Container: 
+        padding = None using &lt;Compiled NFC_CONTROL_PACKET&gt; from 40 00 01 00</msg>
+<msg time="2024-12-18T11:38:46.497089" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -70,13 +68,13 @@
     p...</msg>
 <var>${RESPONSE}</var>
 <doc>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.424604" elapsed="0.002837"/>
+<status status="PASS" start="2024-12-18T11:38:46.492962" elapsed="0.004201"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:49.427651" elapsed="0.000160"/>
+<status status="PASS" start="2024-12-18T11:38:46.497374" elapsed="0.000130"/>
 </return>
-<msg time="2024-12-10T11:00:49.428570" level="INFO">${RESPONSE} = Container: 
+<msg time="2024-12-18T11:38:46.498060" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -85,45 +83,26 @@
         OID = (enum) CORE_RESET 0
     p...</msg>
 <var>${RESPONSE}</var>
-<status status="PASS" start="2024-12-10T11:00:49.422546" elapsed="0.006122"/>
+<status status="PASS" start="2024-12-18T11:38:46.491062" elapsed="0.007081"/>
 </kw>
 <kw name="Element 'header.MT' in '${RESPONSE}' should be equal to '${EXPECTED_MT}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
-<msg time="2024-12-10T11:00:49.430561" level="INFO">descending to 'header' of 'Container: 
-    header = Container: 
-        MT = (enum) ControlPacketResponse 2
-        PBF = (enum) endOfMessage 0
-        GID = (enum) CORE 0
-        RFU = 0
-        OID = (enum) CORE_RESET 0
-    payload_length = 1
-    payload = Container: 
-        Status = (enum) STATUS_OK 0
-        NCI_Version = None
-        ConfigurationStatus = None
-        padding = None'</msg>
-<msg time="2024-12-10T11:00:49.430790" level="INFO">descending to 'MT' of 'Container: 
-    MT = (enum) ControlPacketResponse 2
-    PBF = (enum) endOfMessage 0
-    GID = (enum) CORE 0
-    RFU = 0
-    OID = (enum) CORE_RESET 0'</msg>
 <doc>Checks that the element located at locator in construct is equal to expectedValue.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.429369" elapsed="0.001582"/>
+<status status="PASS" start="2024-12-18T11:38:46.499020" elapsed="0.000631"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:49.431124" elapsed="0.000180"/>
+<status status="PASS" start="2024-12-18T11:38:46.499804" elapsed="0.000144"/>
 </return>
-<status status="PASS" start="2024-12-10T11:00:49.419051" elapsed="0.012805"/>
+<status status="PASS" start="2024-12-18T11:38:46.487543" elapsed="0.012692"/>
 </kw>
-<kw name="Expect Response from ${NCI_READ} of type ${MT.ControlPacketNotification}" source_name="Expect Response from ${NCI_READ} of type ${EXPECTED_MT}">
-<kw name="Receive message from NCI from ${NCI_READ}" source_name="Receive message from NCI from ${NCI_READ}">
-<kw name="Wait For Data From Nci" owner="nci_interface">
-<doc>Waits for data from the NCI device.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.437444" elapsed="0.000561"/>
+<kw name="Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketNotification}" source_name="Expect Response from ${nfc_INTERFACE} of type ${EXPECTED_MT}">
+<kw name="Receive message from nfc from ${nfc_INTERFACE}" source_name="Receive message from nfc from ${nfc_INTERFACE}">
+<kw name="Wait For Data From Nfc" owner="nfc_interface">
+<doc>Waits for data from the NFC device.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.505673" elapsed="0.000410"/>
 </kw>
-<kw name="Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
-<msg time="2024-12-10T11:00:49.440688" level="INFO">parsed: Container: 
+<kw name="Parse '${nfc_INTERFACE}' Using Construct '${nfcControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
+<msg time="2024-12-18T11:38:46.508173" level="INFO">parsed: Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -133,9 +112,9 @@
     payload_length = 9
     payload = Container: 
         Reason = (enum) (unknown) 2
-        ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_RESET 1
-        padding = b' \x02\x04\x00\x02\x00K' (total 7) using &lt;Compiled NCI_CONTROL_PACKET&gt; from 60 00 09 02 01 20 02 04 00 02 00 4b</msg>
-<msg time="2024-12-10T11:00:49.441359" level="INFO">${RESPONSE} = Container: 
+        ConfigurationStatus = (enum) NFC_RF_CONFIGURATION_RESET 1
+        padding = b' \x02\x04\x00\x02\x00K' (total 7) using &lt;Compiled NFC_CONTROL_PACKET&gt; from 60 00 09 02 01 20 02 04 00 02 00 4b</msg>
+<msg time="2024-12-18T11:38:46.508610" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -145,13 +124,13 @@
  ...</msg>
 <var>${RESPONSE}</var>
 <doc>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.438809" elapsed="0.002655"/>
+<status status="PASS" start="2024-12-18T11:38:46.506588" elapsed="0.002101"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:49.441862" elapsed="0.000134"/>
+<status status="PASS" start="2024-12-18T11:38:46.508892" elapsed="0.000101"/>
 </return>
-<msg time="2024-12-10T11:00:49.442919" level="INFO">${RESPONSE} = Container: 
+<msg time="2024-12-18T11:38:46.509532" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -160,35 +139,17 @@
         OID = (enum) CORE_RESET 0
  ...</msg>
 <var>${RESPONSE}</var>
-<status status="PASS" start="2024-12-10T11:00:49.436105" elapsed="0.006964"/>
+<status status="PASS" start="2024-12-18T11:38:46.504604" elapsed="0.005006"/>
 </kw>
 <kw name="Element 'header.MT' in '${RESPONSE}' should be equal to '${EXPECTED_MT}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
-<msg time="2024-12-10T11:00:49.445209" level="INFO">descending to 'header' of 'Container: 
-    header = Container: 
-        MT = (enum) ControlPacketNotification 3
-        PBF = (enum) endOfMessage 0
-        GID = (enum) CORE 0
-        RFU = 0
-        OID = (enum) CORE_RESET 0
-    payload_length = 9
-    payload = Container: 
-        Reason = (enum) (unknown) 2
-        ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_RESET 1
-        padding = b' \x02\x04\x00\x02\x00K' (total 7)'</msg>
-<msg time="2024-12-10T11:00:49.445410" level="INFO">descending to 'MT' of 'Container: 
-    MT = (enum) ControlPacketNotification 3
-    PBF = (enum) endOfMessage 0
-    GID = (enum) CORE 0
-    RFU = 0
-    OID = (enum) CORE_RESET 0'</msg>
 <doc>Checks that the element located at locator in construct is equal to expectedValue.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.443997" elapsed="0.001592"/>
+<status status="PASS" start="2024-12-18T11:38:46.510204" elapsed="0.000711"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:49.445788" elapsed="0.000128"/>
+<status status="PASS" start="2024-12-18T11:38:46.511087" elapsed="0.000245"/>
 </return>
-<msg time="2024-12-10T11:00:49.446896" level="INFO">${RESET_NOTIFICATION} = Container: 
+<msg time="2024-12-18T11:38:46.511989" level="INFO">${RESET_NOTIFICATION} = Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -197,66 +158,49 @@
         OID = (enum) CORE_RESET 0
  ...</msg>
 <var>${RESET_NOTIFICATION}</var>
-<status status="PASS" start="2024-12-10T11:00:49.432946" elapsed="0.014094"/>
+<status status="PASS" start="2024-12-18T11:38:46.500917" elapsed="0.011153"/>
 </kw>
-<kw name="Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NCI_RF_CONFIGURATION_RESET}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
-<msg time="2024-12-10T11:00:49.451652" level="INFO">descending to 'payload' of 'Container: 
-    header = Container: 
-        MT = (enum) ControlPacketNotification 3
-        PBF = (enum) endOfMessage 0
-        GID = (enum) CORE 0
-        RFU = 0
-        OID = (enum) CORE_RESET 0
-    payload_length = 9
-    payload = Container: 
-        Reason = (enum) (unknown) 2
-        ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_RESET 1
-        padding = b' \x02\x04\x00\x02\x00K' (total 7)'</msg>
-<msg time="2024-12-10T11:00:49.451879" level="INFO">descending to 'ConfigurationStatus' of 'Container: 
-    Reason = (enum) (unknown) 2
-    ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_RESET 1
-    padding = b' \x02\x04\x00\x02\x00K' (total 7)'</msg>
+<kw name="Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NFC_RF_CONFIGURATION_RESET}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
 <doc>Checks that the element located at locator in construct is equal to expectedValue.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.448345" elapsed="0.003701"/>
+<status status="PASS" start="2024-12-18T11:38:46.512927" elapsed="0.002999"/>
 </kw>
-<kw name="Nci Connection Receive Buffer Should Be Empty" owner="nci_interface">
-<status status="PASS" start="2024-12-10T11:00:49.452769" elapsed="0.000349"/>
+<kw name="Nfc Connection Receive Buffer Should Be Empty" owner="nfc_interface">
+<doc>Verifies that the receive buffer is empty.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.516480" elapsed="0.000328"/>
 </kw>
-<kw name="Close Nci Connection" owner="nci_interface" type="TEARDOWN">
-<doc>Closes the NCI connection by closing the serial connection.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.454109" elapsed="0.011904"/>
+<kw name="Close Nfc Connection" owner="nfc_interface" type="TEARDOWN">
+<doc>Closes the NFC connection by closing the serial connection.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.517626" elapsed="0.008461"/>
 </kw>
-<doc>This test case resets the NFC options using NCI over UART reseting the RF configuration.</doc>
+<doc>This test case resets the NFC options using nfc over UART reseting the RF configuration.</doc>
 <tag>hardware</tag>
-<status status="PASS" start="2024-12-10T11:00:49.150000" elapsed="0.316730"/>
+<status status="PASS" start="2024-12-18T11:38:46.220063" elapsed="0.306306"/>
 </test>
-<test id="s1-s1-t2" name="Reset NFC keeping RF configuration" line="26">
-<kw name="Open Nci Connection Via Uart" owner="nci_interface">
-<msg time="2024-12-10T11:00:49.470907" level="INFO">${NCI_READ} = &lt;_io.FileIO name=5 mode='rb' closefd=False&gt;</msg>
-<msg time="2024-12-10T11:00:49.471042" level="INFO">${NCI_WRITE} = &lt;_io.FileIO name=5 mode='wb' closefd=False&gt;</msg>
-<var>${NCI_READ}</var>
-<var>${NCI_WRITE}</var>
-<arg>${NCI_INTERFACE}</arg>
+<test id="s1-s1-t2" name="Reset NFC keeping RF configuration" line="25">
+<kw name="Open Nfc Connection Via Uart" owner="nfc_interface">
+<msg time="2024-12-18T11:38:46.530043" level="INFO">${NFC_INTERFACE} = timeoutExceptionOnTimeoutSerial&lt;id=0x7b2d537f38b0, open=True&gt;(port='/dev/serial/by-id/usb-STMicroelectronics_STM32_STLink_066EFF3031454D3043225321-if02', baudrate=115200, bytesize=8, parity='N', stopb...</msg>
+<var>${NFC_INTERFACE}</var>
+<arg>${NFC_INTERFACE}</arg>
 <arg>${BAUD_RATE}</arg>
-<doc>Opens a connection to a NCI device via UART.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.468967" elapsed="0.002135"/>
+<doc>Opens a connection to a NFC device via UART.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.528254" elapsed="0.001880"/>
 </kw>
 <kw name="Sleep" owner="BuiltIn">
-<msg time="2024-12-10T11:00:49.722452" level="INFO">Slept 250 milliseconds.</msg>
+<msg time="2024-12-18T11:38:46.781390" level="INFO">Slept 250 milliseconds.</msg>
 <arg>0.25</arg>
 <doc>Pauses the test executed for the given time.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.471704" elapsed="0.251020"/>
+<status status="PASS" start="2024-12-18T11:38:46.530611" elapsed="0.251053"/>
 </kw>
-<kw name="Empty Nci Connection Receive Buffer" owner="nci_interface">
-<status status="PASS" start="2024-12-10T11:00:49.723425" elapsed="0.000362"/>
+<kw name="Empty Nfc Connection Receive Buffer" owner="nfc_interface">
+<doc>Empties the receive buffer.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.782423" elapsed="0.000385"/>
 </kw>
 <kw name="Modify the element located at 'payload.ResetType' of '${NFC_RST_CMD}' to '${CORE_RESET_CMD.KEEP_CONFIGURATION}'" owner="robotframework_construct" source_name="Modify the element located at '${locator}' of '${constructDict}' to '${value}'">
-<msg time="2024-12-10T11:00:49.727518" level="INFO">descending to 'payload' of '{'header': {'MT': EnumIntegerString.new(1, 'ControlPacketCommand'), 'PBF': 0, 'GID': EnumIntegerString.new(0, 'CORE'), 'RFU': 0, 'OID': EnumIntegerString.new(0, 'CORE_RESET')}, 'payload_length': 1, 'payload': {'ResetType': EnumIntegerString.new(1, 'RESET_CONFIGURATION')}, 'padding': b''}'</msg>
 <doc>Modifies the element located at locator in constructDict to the value value.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.724580" elapsed="0.003202"/>
+<status status="PASS" start="2024-12-18T11:38:46.783652" elapsed="0.002712"/>
 </kw>
-<kw name="Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_WRITE}'" owner="robotframework_construct" source_name="Write binary data generated from '${data}' using construct '${identifier}' to '${file}'">
-<msg time="2024-12-10T11:00:49.731257" level="INFO">built: 20 00 01 00 (a total of 4 bytes) using "&lt;Compiled NCI_CONTROL_PACKET&gt;" from :"
+<kw name="Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${nfcControlPacket}' To '${NFC_INTERFACE}'" owner="robotframework_construct" source_name="Write binary data generated from '${data}' using construct '${identifier}' to '${file}'">
+<msg time="2024-12-18T11:38:46.789527" level="INFO">built: 20 00 01 00 (a total of 4 bytes) using "&lt;Compiled NFC_CONTROL_PACKET&gt;" from :"
 {'header': {'GID': EnumIntegerString.new(0, 'CORE'),
             'MT': EnumIntegerString.new(1, 'ControlPacketCommand'),
             'OID': EnumIntegerString.new(0, 'CORE_RESET'),
@@ -266,16 +210,16 @@
  'payload': {'ResetType': EnumIntegerString.new(0, 'KEEP_CONFIGURATION')},
  'payload_length': 1}" </msg>
 <doc>Writes binary data to a file or sends it over a socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.729088" elapsed="0.002465"/>
+<status status="PASS" start="2024-12-18T11:38:46.787532" elapsed="0.002618"/>
 </kw>
-<kw name="Expect Response from ${NCI_READ} of type ${MT.ControlPacketResponse}" source_name="Expect Response from ${NCI_READ} of type ${EXPECTED_MT}">
-<kw name="Receive message from NCI from ${NCI_READ}" source_name="Receive message from NCI from ${NCI_READ}">
-<kw name="Wait For Data From Nci" owner="nci_interface">
-<doc>Waits for data from the NCI device.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.736211" elapsed="0.000408"/>
+<kw name="Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketResponse}" source_name="Expect Response from ${nfc_INTERFACE} of type ${EXPECTED_MT}">
+<kw name="Receive message from nfc from ${nfc_INTERFACE}" source_name="Receive message from nfc from ${nfc_INTERFACE}">
+<kw name="Wait For Data From Nfc" owner="nfc_interface">
+<doc>Waits for data from the NFC device.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.795186" elapsed="0.000346"/>
 </kw>
-<kw name="Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
-<msg time="2024-12-10T11:00:49.738400" level="INFO">parsed: Container: 
+<kw name="Parse '${nfc_INTERFACE}' Using Construct '${nfcControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
+<msg time="2024-12-18T11:38:46.797510" level="INFO">parsed: Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -285,10 +229,10 @@
     payload_length = 1
     payload = Container: 
         Status = (enum) STATUS_OK 0
-        NCI_Version = None
+        NFC_Version = None
         ConfigurationStatus = None
-        padding = None using &lt;Compiled NCI_CONTROL_PACKET&gt; from 40 00 01 00</msg>
-<msg time="2024-12-10T11:00:49.738842" level="INFO">${RESPONSE} = Container: 
+        padding = None using &lt;Compiled NFC_CONTROL_PACKET&gt; from 40 00 01 00</msg>
+<msg time="2024-12-18T11:38:46.797985" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -298,13 +242,13 @@
     p...</msg>
 <var>${RESPONSE}</var>
 <doc>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.737122" elapsed="0.001797"/>
+<status status="PASS" start="2024-12-18T11:38:46.796103" elapsed="0.001964"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:49.739235" elapsed="0.000109"/>
+<status status="PASS" start="2024-12-18T11:38:46.798245" elapsed="0.000105"/>
 </return>
-<msg time="2024-12-10T11:00:49.739923" level="INFO">${RESPONSE} = Container: 
+<msg time="2024-12-18T11:38:46.798967" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -313,45 +257,26 @@
         OID = (enum) CORE_RESET 0
     p...</msg>
 <var>${RESPONSE}</var>
-<status status="PASS" start="2024-12-10T11:00:49.735305" elapsed="0.004695"/>
+<status status="PASS" start="2024-12-18T11:38:46.794224" elapsed="0.004830"/>
 </kw>
 <kw name="Element 'header.MT' in '${RESPONSE}' should be equal to '${EXPECTED_MT}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
-<msg time="2024-12-10T11:00:49.741407" level="INFO">descending to 'header' of 'Container: 
-    header = Container: 
-        MT = (enum) ControlPacketResponse 2
-        PBF = (enum) endOfMessage 0
-        GID = (enum) CORE 0
-        RFU = 0
-        OID = (enum) CORE_RESET 0
-    payload_length = 1
-    payload = Container: 
-        Status = (enum) STATUS_OK 0
-        NCI_Version = None
-        ConfigurationStatus = None
-        padding = None'</msg>
-<msg time="2024-12-10T11:00:49.741560" level="INFO">descending to 'MT' of 'Container: 
-    MT = (enum) ControlPacketResponse 2
-    PBF = (enum) endOfMessage 0
-    GID = (enum) CORE 0
-    RFU = 0
-    OID = (enum) CORE_RESET 0'</msg>
 <doc>Checks that the element located at locator in construct is equal to expectedValue.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.740596" elapsed="0.001107"/>
+<status status="PASS" start="2024-12-18T11:38:46.799629" elapsed="0.000758"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:49.741851" elapsed="0.000092"/>
+<status status="PASS" start="2024-12-18T11:38:46.800590" elapsed="0.000111"/>
 </return>
-<status status="PASS" start="2024-12-10T11:00:49.732264" elapsed="0.010024"/>
+<status status="PASS" start="2024-12-18T11:38:46.791125" elapsed="0.010127"/>
 </kw>
-<kw name="Expect Response from ${NCI_READ} of type ${MT.ControlPacketNotification}" source_name="Expect Response from ${NCI_READ} of type ${EXPECTED_MT}">
-<kw name="Receive message from NCI from ${NCI_READ}" source_name="Receive message from NCI from ${NCI_READ}">
-<kw name="Wait For Data From Nci" owner="nci_interface">
-<doc>Waits for data from the NCI device.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.747686" elapsed="0.000433"/>
+<kw name="Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketNotification}" source_name="Expect Response from ${nfc_INTERFACE} of type ${EXPECTED_MT}">
+<kw name="Receive message from nfc from ${nfc_INTERFACE}" source_name="Receive message from nfc from ${nfc_INTERFACE}">
+<kw name="Wait For Data From Nfc" owner="nfc_interface">
+<doc>Waits for data from the NFC device.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.806725" elapsed="0.000481"/>
 </kw>
-<kw name="Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
-<msg time="2024-12-10T11:00:49.750611" level="INFO">parsed: Container: 
+<kw name="Parse '${nfc_INTERFACE}' Using Construct '${nfcControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
+<msg time="2024-12-18T11:38:46.809510" level="INFO">parsed: Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -361,9 +286,9 @@
     payload_length = 9
     payload = Container: 
         Reason = (enum) (unknown) 2
-        ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_KEPT 0
-        padding = b' \x02\x04\x00\x02\x00K' (total 7) using &lt;Compiled NCI_CONTROL_PACKET&gt; from 60 00 09 02 00 20 02 04 00 02 00 4b</msg>
-<msg time="2024-12-10T11:00:49.751054" level="INFO">${RESPONSE} = Container: 
+        ConfigurationStatus = (enum) NFC_RF_CONFIGURATION_KEPT 0
+        padding = b' \x02\x04\x00\x02\x00K' (total 7) using &lt;Compiled NFC_CONTROL_PACKET&gt; from 60 00 09 02 00 20 02 04 00 02 00 4b</msg>
+<msg time="2024-12-18T11:38:46.809988" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -373,13 +298,13 @@
  ...</msg>
 <var>${RESPONSE}</var>
 <doc>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.749004" elapsed="0.002127"/>
+<status status="PASS" start="2024-12-18T11:38:46.807819" elapsed="0.002362"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:49.751337" elapsed="0.000096"/>
+<status status="PASS" start="2024-12-18T11:38:46.810369" elapsed="0.000101"/>
 </return>
-<msg time="2024-12-10T11:00:49.751974" level="INFO">${RESPONSE} = Container: 
+<msg time="2024-12-18T11:38:46.811094" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -388,35 +313,17 @@
         OID = (enum) CORE_RESET 0
  ...</msg>
 <var>${RESPONSE}</var>
-<status status="PASS" start="2024-12-10T11:00:49.746574" elapsed="0.005476"/>
+<status status="PASS" start="2024-12-18T11:38:46.805537" elapsed="0.005642"/>
 </kw>
 <kw name="Element 'header.MT' in '${RESPONSE}' should be equal to '${EXPECTED_MT}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
-<msg time="2024-12-10T11:00:49.753568" level="INFO">descending to 'header' of 'Container: 
-    header = Container: 
-        MT = (enum) ControlPacketNotification 3
-        PBF = (enum) endOfMessage 0
-        GID = (enum) CORE 0
-        RFU = 0
-        OID = (enum) CORE_RESET 0
-    payload_length = 9
-    payload = Container: 
-        Reason = (enum) (unknown) 2
-        ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_KEPT 0
-        padding = b' \x02\x04\x00\x02\x00K' (total 7)'</msg>
-<msg time="2024-12-10T11:00:49.753752" level="INFO">descending to 'MT' of 'Container: 
-    MT = (enum) ControlPacketNotification 3
-    PBF = (enum) endOfMessage 0
-    GID = (enum) CORE 0
-    RFU = 0
-    OID = (enum) CORE_RESET 0'</msg>
 <doc>Checks that the element located at locator in construct is equal to expectedValue.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.752720" elapsed="0.001150"/>
+<status status="PASS" start="2024-12-18T11:38:46.811759" elapsed="0.000738"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:49.753998" elapsed="0.000081"/>
+<status status="PASS" start="2024-12-18T11:38:46.812655" elapsed="0.000091"/>
 </return>
-<msg time="2024-12-10T11:00:49.754582" level="INFO">${RESET_NOTIFICATION} = Container: 
+<msg time="2024-12-18T11:38:46.813379" level="INFO">${RESET_NOTIFICATION} = Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -425,61 +332,45 @@
         OID = (enum) CORE_RESET 0
  ...</msg>
 <var>${RESET_NOTIFICATION}</var>
-<status status="PASS" start="2024-12-10T11:00:49.743014" elapsed="0.011630"/>
+<status status="PASS" start="2024-12-18T11:38:46.802105" elapsed="0.011357"/>
 </kw>
-<kw name="Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NCI_RF_CONFIGURATION_KEPT}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
-<msg time="2024-12-10T11:00:49.757364" level="INFO">descending to 'payload' of 'Container: 
-    header = Container: 
-        MT = (enum) ControlPacketNotification 3
-        PBF = (enum) endOfMessage 0
-        GID = (enum) CORE 0
-        RFU = 0
-        OID = (enum) CORE_RESET 0
-    payload_length = 9
-    payload = Container: 
-        Reason = (enum) (unknown) 2
-        ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_KEPT 0
-        padding = b' \x02\x04\x00\x02\x00K' (total 7)'</msg>
-<msg time="2024-12-10T11:00:49.757518" level="INFO">descending to 'ConfigurationStatus' of 'Container: 
-    Reason = (enum) (unknown) 2
-    ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_KEPT 0
-    padding = b' \x02\x04\x00\x02\x00K' (total 7)'</msg>
+<kw name="Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NFC_RF_CONFIGURATION_KEPT}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
 <doc>Checks that the element located at locator in construct is equal to expectedValue.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.755333" elapsed="0.002343"/>
+<status status="PASS" start="2024-12-18T11:38:46.814315" elapsed="0.002402"/>
 </kw>
-<kw name="Nci Connection Receive Buffer Should Be Empty" owner="nci_interface">
-<status status="PASS" start="2024-12-10T11:00:49.758303" elapsed="0.000416"/>
+<kw name="Nfc Connection Receive Buffer Should Be Empty" owner="nfc_interface">
+<doc>Verifies that the receive buffer is empty.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.817405" elapsed="0.000557"/>
 </kw>
-<kw name="Close Nci Connection" owner="nci_interface" type="TEARDOWN">
-<doc>Closes the NCI connection by closing the serial connection.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.759801" elapsed="0.007939"/>
+<kw name="Close Nfc Connection" owner="nfc_interface" type="TEARDOWN">
+<doc>Closes the NFC connection by closing the serial connection.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.818980" elapsed="0.008881"/>
 </kw>
-<doc>This test case resets the NFC options using NCI over UART keeping the RF configuration.</doc>
+<doc>This test case resets the NFC options using nfc over UART keeping the RF configuration.</doc>
 <tag>hardware</tag>
-<status status="PASS" start="2024-12-10T11:00:49.467671" elapsed="0.300338"/>
+<status status="PASS" start="2024-12-18T11:38:46.527099" elapsed="0.301095"/>
 </test>
-<test id="s1-s1-t3" name="Actively poll for A cards" line="38">
-<kw name="Open Nci Connection Via Uart" owner="nci_interface">
-<msg time="2024-12-10T11:00:49.771315" level="INFO">${NCI_READ} = &lt;_io.FileIO name=5 mode='rb' closefd=False&gt;</msg>
-<msg time="2024-12-10T11:00:49.771440" level="INFO">${NCI_WRITE} = &lt;_io.FileIO name=5 mode='wb' closefd=False&gt;</msg>
-<var>${NCI_READ}</var>
-<var>${NCI_WRITE}</var>
-<arg>${NCI_INTERFACE}</arg>
+<test id="s1-s1-t3" name="Actively poll for A cards" line="37">
+<kw name="Open Nfc Connection Via Uart" owner="nfc_interface">
+<msg time="2024-12-18T11:38:46.832340" level="INFO">${NFC_INTERFACE} = timeoutExceptionOnTimeoutSerial&lt;id=0x7b2d53845870, open=True&gt;(port='/dev/serial/by-id/usb-STMicroelectronics_STM32_STLink_066EFF3031454D3043225321-if02', baudrate=115200, bytesize=8, parity='N', stopb...</msg>
+<var>${NFC_INTERFACE}</var>
+<arg>${NFC_INTERFACE}</arg>
 <arg>${BAUD_RATE}</arg>
-<doc>Opens a connection to a NCI device via UART.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.769751" elapsed="0.001747"/>
+<doc>Opens a connection to a NFC device via UART.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.830376" elapsed="0.002096"/>
 </kw>
 <kw name="Sleep" owner="BuiltIn">
-<msg time="2024-12-10T11:00:50.022652" level="INFO">Slept 250 milliseconds.</msg>
+<msg time="2024-12-18T11:38:47.083717" level="INFO">Slept 250 milliseconds.</msg>
 <arg>0.25</arg>
 <doc>Pauses the test executed for the given time.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.771957" elapsed="0.251133"/>
+<status status="PASS" start="2024-12-18T11:38:46.833045" elapsed="0.251013"/>
 </kw>
-<kw name="Empty Nci Connection Receive Buffer" owner="nci_interface">
-<status status="PASS" start="2024-12-10T11:00:50.023827" elapsed="0.000534"/>
+<kw name="Empty Nfc Connection Receive Buffer" owner="nfc_interface">
+<doc>Empties the receive buffer.</doc>
+<status status="PASS" start="2024-12-18T11:38:47.084809" elapsed="0.000489"/>
 </kw>
-<kw name="Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_WRITE}'" owner="robotframework_construct" source_name="Write binary data generated from '${data}' using construct '${identifier}' to '${file}'">
-<msg time="2024-12-10T11:00:50.027114" level="INFO">built: 20 00 01 00 (a total of 4 bytes) using "&lt;Compiled NCI_CONTROL_PACKET&gt;" from :"
+<kw name="Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${nfcControlPacket}' To '${NFC_INTERFACE}'" owner="robotframework_construct" source_name="Write binary data generated from '${data}' using construct '${identifier}' to '${file}'">
+<msg time="2024-12-18T11:38:47.088363" level="INFO">built: 20 00 01 00 (a total of 4 bytes) using "&lt;Compiled NFC_CONTROL_PACKET&gt;" from :"
 {'header': {'GID': EnumIntegerString.new(0, 'CORE'),
             'MT': EnumIntegerString.new(1, 'ControlPacketCommand'),
             'OID': EnumIntegerString.new(0, 'CORE_RESET'),
@@ -489,16 +380,16 @@
  'payload': {'ResetType': EnumIntegerString.new(0, 'KEEP_CONFIGURATION')},
  'payload_length': 1}" </msg>
 <doc>Writes binary data to a file or sends it over a socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.025240" elapsed="0.002226"/>
+<status status="PASS" start="2024-12-18T11:38:47.086256" elapsed="0.002712"/>
 </kw>
-<kw name="Expect Response from ${NCI_READ} of type ${MT.ControlPacketResponse}" source_name="Expect Response from ${NCI_READ} of type ${EXPECTED_MT}">
-<kw name="Receive message from NCI from ${NCI_READ}" source_name="Receive message from NCI from ${NCI_READ}">
-<kw name="Wait For Data From Nci" owner="nci_interface">
-<doc>Waits for data from the NCI device.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.033072" elapsed="0.000382"/>
+<kw name="Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketResponse}" source_name="Expect Response from ${nfc_INTERFACE} of type ${EXPECTED_MT}">
+<kw name="Receive message from nfc from ${nfc_INTERFACE}" source_name="Receive message from nfc from ${nfc_INTERFACE}">
+<kw name="Wait For Data From Nfc" owner="nfc_interface">
+<doc>Waits for data from the NFC device.</doc>
+<status status="PASS" start="2024-12-18T11:38:47.095040" elapsed="0.000408"/>
 </kw>
-<kw name="Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
-<msg time="2024-12-10T11:00:50.035247" level="INFO">parsed: Container: 
+<kw name="Parse '${nfc_INTERFACE}' Using Construct '${nfcControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
+<msg time="2024-12-18T11:38:47.097471" level="INFO">parsed: Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -508,10 +399,10 @@
     payload_length = 1
     payload = Container: 
         Status = (enum) STATUS_OK 0
-        NCI_Version = None
+        NFC_Version = None
         ConfigurationStatus = None
-        padding = None using &lt;Compiled NCI_CONTROL_PACKET&gt; from 40 00 01 00</msg>
-<msg time="2024-12-10T11:00:50.035691" level="INFO">${RESPONSE} = Container: 
+        padding = None using &lt;Compiled NFC_CONTROL_PACKET&gt; from 40 00 01 00</msg>
+<msg time="2024-12-18T11:38:47.097979" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -521,13 +412,13 @@
     p...</msg>
 <var>${RESPONSE}</var>
 <doc>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.033941" elapsed="0.001827"/>
+<status status="PASS" start="2024-12-18T11:38:47.096042" elapsed="0.002023"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:50.035929" elapsed="0.000097"/>
+<status status="PASS" start="2024-12-18T11:38:47.098248" elapsed="0.000113"/>
 </return>
-<msg time="2024-12-10T11:00:50.036662" level="INFO">${RESPONSE} = Container: 
+<msg time="2024-12-18T11:38:47.098960" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -536,45 +427,26 @@
         OID = (enum) CORE_RESET 0
     p...</msg>
 <var>${RESPONSE}</var>
-<status status="PASS" start="2024-12-10T11:00:50.032133" elapsed="0.004605"/>
+<status status="PASS" start="2024-12-18T11:38:47.094085" elapsed="0.004958"/>
 </kw>
 <kw name="Element 'header.MT' in '${RESPONSE}' should be equal to '${EXPECTED_MT}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
-<msg time="2024-12-10T11:00:50.038166" level="INFO">descending to 'header' of 'Container: 
-    header = Container: 
-        MT = (enum) ControlPacketResponse 2
-        PBF = (enum) endOfMessage 0
-        GID = (enum) CORE 0
-        RFU = 0
-        OID = (enum) CORE_RESET 0
-    payload_length = 1
-    payload = Container: 
-        Status = (enum) STATUS_OK 0
-        NCI_Version = None
-        ConfigurationStatus = None
-        padding = None'</msg>
-<msg time="2024-12-10T11:00:50.038339" level="INFO">descending to 'MT' of 'Container: 
-    MT = (enum) ControlPacketResponse 2
-    PBF = (enum) endOfMessage 0
-    GID = (enum) CORE 0
-    RFU = 0
-    OID = (enum) CORE_RESET 0'</msg>
 <doc>Checks that the element located at locator in construct is equal to expectedValue.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.037341" elapsed="0.001138"/>
+<status status="PASS" start="2024-12-18T11:38:47.099742" elapsed="0.000816"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:50.038624" elapsed="0.000089"/>
+<status status="PASS" start="2024-12-18T11:38:47.100749" elapsed="0.000125"/>
 </return>
-<status status="PASS" start="2024-12-10T11:00:50.028567" elapsed="0.010456"/>
+<status status="PASS" start="2024-12-18T11:38:47.090240" elapsed="0.011046"/>
 </kw>
-<kw name="Expect Response from ${NCI_READ} of type ${MT.ControlPacketNotification}" source_name="Expect Response from ${NCI_READ} of type ${EXPECTED_MT}">
-<kw name="Receive message from NCI from ${NCI_READ}" source_name="Receive message from NCI from ${NCI_READ}">
-<kw name="Wait For Data From Nci" owner="nci_interface">
-<doc>Waits for data from the NCI device.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.045433" elapsed="0.000467"/>
+<kw name="Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketNotification}" source_name="Expect Response from ${nfc_INTERFACE} of type ${EXPECTED_MT}">
+<kw name="Receive message from nfc from ${nfc_INTERFACE}" source_name="Receive message from nfc from ${nfc_INTERFACE}">
+<kw name="Wait For Data From Nfc" owner="nfc_interface">
+<doc>Waits for data from the NFC device.</doc>
+<status status="PASS" start="2024-12-18T11:38:47.106476" elapsed="0.000512"/>
 </kw>
-<kw name="Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
-<msg time="2024-12-10T11:00:50.047918" level="INFO">parsed: Container: 
+<kw name="Parse '${nfc_INTERFACE}' Using Construct '${nfcControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
+<msg time="2024-12-18T11:38:47.109769" level="INFO">parsed: Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -584,9 +456,9 @@
     payload_length = 9
     payload = Container: 
         Reason = (enum) (unknown) 2
-        ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_KEPT 0
-        padding = b' \x02\x04\x00\x02\x00K' (total 7) using &lt;Compiled NCI_CONTROL_PACKET&gt; from 60 00 09 02 00 20 02 04 00 02 00 4b</msg>
-<msg time="2024-12-10T11:00:50.048525" level="INFO">${RESPONSE} = Container: 
+        ConfigurationStatus = (enum) NFC_RF_CONFIGURATION_KEPT 0
+        padding = b' \x02\x04\x00\x02\x00K' (total 7) using &lt;Compiled NFC_CONTROL_PACKET&gt; from 60 00 09 02 00 20 02 04 00 02 00 4b</msg>
+<msg time="2024-12-18T11:38:47.110530" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -596,13 +468,13 @@
  ...</msg>
 <var>${RESPONSE}</var>
 <doc>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.046568" elapsed="0.002061"/>
+<status status="PASS" start="2024-12-18T11:38:47.107817" elapsed="0.002784"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:50.048871" elapsed="0.000143"/>
+<status status="PASS" start="2024-12-18T11:38:47.110750" elapsed="0.000091"/>
 </return>
-<msg time="2024-12-10T11:00:50.049742" level="INFO">${RESPONSE} = Container: 
+<msg time="2024-12-18T11:38:47.111413" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -611,38 +483,20 @@
         OID = (enum) CORE_RESET 0
  ...</msg>
 <var>${RESPONSE}</var>
-<status status="PASS" start="2024-12-10T11:00:50.044225" elapsed="0.005604"/>
+<status status="PASS" start="2024-12-18T11:38:47.105306" elapsed="0.006171"/>
 </kw>
 <kw name="Element 'header.MT' in '${RESPONSE}' should be equal to '${EXPECTED_MT}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
-<msg time="2024-12-10T11:00:50.051300" level="INFO">descending to 'header' of 'Container: 
-    header = Container: 
-        MT = (enum) ControlPacketNotification 3
-        PBF = (enum) endOfMessage 0
-        GID = (enum) CORE 0
-        RFU = 0
-        OID = (enum) CORE_RESET 0
-    payload_length = 9
-    payload = Container: 
-        Reason = (enum) (unknown) 2
-        ConfigurationStatus = (enum) NCI_RF_CONFIGURATION_KEPT 0
-        padding = b' \x02\x04\x00\x02\x00K' (total 7)'</msg>
-<msg time="2024-12-10T11:00:50.051456" level="INFO">descending to 'MT' of 'Container: 
-    MT = (enum) ControlPacketNotification 3
-    PBF = (enum) endOfMessage 0
-    GID = (enum) CORE 0
-    RFU = 0
-    OID = (enum) CORE_RESET 0'</msg>
 <doc>Checks that the element located at locator in construct is equal to expectedValue.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.050471" elapsed="0.001126"/>
+<status status="PASS" start="2024-12-18T11:38:47.112048" elapsed="0.000613"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:50.051747" elapsed="0.000133"/>
+<status status="PASS" start="2024-12-18T11:38:47.112803" elapsed="0.000143"/>
 </return>
-<status status="PASS" start="2024-12-10T11:00:50.039655" elapsed="0.012572"/>
+<status status="PASS" start="2024-12-18T11:38:47.102013" elapsed="0.011220"/>
 </kw>
-<kw name="Write Binary Data Generated From '${NFC_INIT_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_WRITE}'" owner="robotframework_construct" source_name="Write binary data generated from '${data}' using construct '${identifier}' to '${file}'">
-<msg time="2024-12-10T11:00:50.054637" level="INFO">built: 20 01 02 00 00 (a total of 5 bytes) using "&lt;Compiled NCI_CONTROL_PACKET&gt;" from :"
+<kw name="Write Binary Data Generated From '${NFC_INIT_CMD}' Using Construct '${nfcControlPacket}' To '${NFC_INTERFACE}'" owner="robotframework_construct" source_name="Write binary data generated from '${data}' using construct '${identifier}' to '${file}'">
+<msg time="2024-12-18T11:38:47.115163" level="INFO">built: 20 01 02 00 00 (a total of 5 bytes) using "&lt;Compiled NFC_CONTROL_PACKET&gt;" from :"
 {'header': {'GID': EnumIntegerString.new(0, 'CORE'),
             'MT': EnumIntegerString.new(1, 'ControlPacketCommand'),
             'OID': EnumIntegerString.new(1, 'CORE_INIT'),
@@ -652,16 +506,16 @@
  'payload': {'ConstValue': b'\x00\x00'},
  'payload_length': 2}" </msg>
 <doc>Writes binary data to a file or sends it over a socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.052926" elapsed="0.001951"/>
+<status status="PASS" start="2024-12-18T11:38:47.113891" elapsed="0.001590"/>
 </kw>
-<kw name="Expect Status OK response from ${NCI_READ}" source_name="Expect Status OK response from ${NCI_READ}">
-<kw name="Receive message from NCI from ${NCI_READ}" source_name="Receive message from NCI from ${NCI_READ}">
-<kw name="Wait For Data From Nci" owner="nci_interface">
-<doc>Waits for data from the NCI device.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.057482" elapsed="0.000339"/>
+<kw name="Expect Status OK response from ${NFC_INTERFACE}" source_name="Expect Status OK response from ${nfc_INTERFACE}">
+<kw name="Receive message from nfc from ${nfc_INTERFACE}" source_name="Receive message from nfc from ${nfc_INTERFACE}">
+<kw name="Wait For Data From Nfc" owner="nfc_interface">
+<doc>Waits for data from the NFC device.</doc>
+<status status="PASS" start="2024-12-18T11:38:47.118266" elapsed="0.000379"/>
 </kw>
-<kw name="Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
-<msg time="2024-12-10T11:00:50.060603" level="INFO">parsed: Container: 
+<kw name="Parse '${nfc_INTERFACE}' Using Construct '${nfcControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
+<msg time="2024-12-18T11:38:47.121751" level="INFO">parsed: Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -695,8 +549,8 @@
         Max_Control_Package_Payload_Size = 0
         Max_Size_for_Large_Parameters = 0
         Manufacture_ID = 255
-        Manufacturer_specific_info = b'\x03\x01\x02\x03' (total 4) using &lt;Compiled NCI_CONTROL_PACKET&gt; from 40 01 11 00 01 06 00 00 01 32 00 ff 00 00 00 ff 03 01 02 03</msg>
-<msg time="2024-12-10T11:00:50.061568" level="INFO">${RESPONSE} = Container: 
+        Manufacturer_specific_info = b'\x03\x01\x02\x03' (total 4) using &lt;Compiled NFC_CONTROL_PACKET&gt; from 40 01 11 00 01 06 00 00 01 32 00 ff 00 00 00 ff 03 01 02 03</msg>
+<msg time="2024-12-18T11:38:47.122962" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -706,13 +560,13 @@
     pa...</msg>
 <var>${RESPONSE}</var>
 <doc>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.058349" elapsed="0.003381"/>
+<status status="PASS" start="2024-12-18T11:38:47.119218" elapsed="0.003947"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:50.061926" elapsed="0.000110"/>
+<status status="PASS" start="2024-12-18T11:38:47.123458" elapsed="0.000186"/>
 </return>
-<msg time="2024-12-10T11:00:50.063055" level="INFO">${RESPONSE} = Container: 
+<msg time="2024-12-18T11:38:47.124822" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -721,82 +575,20 @@
         OID = (enum) CORE_INIT 1
     pa...</msg>
 <var>${RESPONSE}</var>
-<status status="PASS" start="2024-12-10T11:00:50.056627" elapsed="0.006577"/>
+<status status="PASS" start="2024-12-18T11:38:47.117257" elapsed="0.007729"/>
 </kw>
 <kw name="Element 'payload.Status' in '${RESPONSE}' should be equal to '${GENERIC_STATUS_CODE.STATUS_OK}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
-<msg time="2024-12-10T11:00:50.067235" level="INFO">descending to 'payload' of 'Container: 
-    header = Container: 
-        MT = (enum) ControlPacketResponse 2
-        PBF = (enum) endOfMessage 0
-        GID = (enum) CORE 0
-        RFU = 0
-        OID = (enum) CORE_INIT 1
-    payload_length = 17
-    payload = Container: 
-        Status = (enum) STATUS_OK 0
-        NFCC_Features = Container: 
-            Octet_0 = Container: 
-                RFU = 0
-                DiscoverConfigurationmode = (enum) SINGLDE_DH 0
-                DiscoverFrequencyConfiguration = (enum) RF_DISCOVER_CMD_SUPPORTED 1
-            Octet_1 = Container: 
-                RFU = 0
-                AID_BASED_ROUTING = 0
-                PROTOCOL_BASED_ROUTING = 1
-                TECHNOLOGY_BASED_ROUTING = 1
-            Octet_2 = Container: 
-                RFU = 0
-                SWITCH_OFF_STATE_SUPPORTED = (enum) (unknown) 0
-                BATTERY_OFF_STATE_SUPPORTED = (enum) (unknown) 0
-            Octet_3 = Container: 
-                RFU = 0
-        NumInterfaces = 1
-        SupportedInterfaces = ListContainer: 
-            50
-        Max_Logical_Connections = 0
-        Max_Routing_Table_Size = 65280
-        Max_Control_Package_Payload_Size = 0
-        Max_Size_for_Large_Parameters = 0
-        Manufacture_ID = 255
-        Manufacturer_specific_info = b'\x03\x01\x02\x03' (total 4)'</msg>
-<msg time="2024-12-10T11:00:50.067662" level="INFO">descending to 'Status' of 'Container: 
-    Status = (enum) STATUS_OK 0
-    NFCC_Features = Container: 
-        Octet_0 = Container: 
-            RFU = 0
-            DiscoverConfigurationmode = (enum) SINGLDE_DH 0
-            DiscoverFrequencyConfiguration = (enum) RF_DISCOVER_CMD_SUPPORTED 1
-        Octet_1 = Container: 
-            RFU = 0
-            AID_BASED_ROUTING = 0
-            PROTOCOL_BASED_ROUTING = 1
-            TECHNOLOGY_BASED_ROUTING = 1
-        Octet_2 = Container: 
-            RFU = 0
-            SWITCH_OFF_STATE_SUPPORTED = (enum) (unknown) 0
-            BATTERY_OFF_STATE_SUPPORTED = (enum) (unknown) 0
-        Octet_3 = Container: 
-            RFU = 0
-    NumInterfaces = 1
-    SupportedInterfaces = ListContainer: 
-        50
-    Max_Logical_Connections = 0
-    Max_Routing_Table_Size = 65280
-    Max_Control_Package_Payload_Size = 0
-    Max_Size_for_Large_Parameters = 0
-    Manufacture_ID = 255
-    Manufacturer_specific_info = b'\x03\x01\x02\x03' (total 4)'</msg>
 <doc>Checks that the element located at locator in construct is equal to expectedValue.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.063997" elapsed="0.003857"/>
+<status status="PASS" start="2024-12-18T11:38:47.125720" elapsed="0.002484"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:50.068032" elapsed="0.000099"/>
+<status status="PASS" start="2024-12-18T11:38:47.128392" elapsed="0.000103"/>
 </return>
-<status status="PASS" start="2024-12-10T11:00:50.055585" elapsed="0.012927"/>
+<status status="PASS" start="2024-12-18T11:38:47.116176" elapsed="0.012654"/>
 </kw>
-<kw name="Write Binary Data Generated From '${NCI_DISCVER_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_WRITE}'" owner="robotframework_construct" source_name="Write binary data generated from '${data}' using construct '${identifier}' to '${file}'">
-<msg time="2024-12-10T11:00:50.071852" level="INFO">built: 21 03 0d 06 00 02 01 02 02 02 06 02 80 02 82 02 (a total of 16 bytes) using "&lt;Compiled NCI_CONTROL_PACKET&gt;" from :"
+<kw name="Write Binary Data Generated From '${NFC_DISCVER_CMD}' Using Construct '${NFCControlPacket}' To '${NFC_INTERFACE}'" owner="robotframework_construct" source_name="Write binary data generated from '${data}' using construct '${identifier}' to '${file}'">
+<msg time="2024-12-18T11:38:47.132271" level="INFO">built: 21 03 0d 06 00 02 01 02 02 02 06 02 80 02 82 02 (a total of 16 bytes) using "&lt;Compiled NFC_CONTROL_PACKET&gt;" from :"
 {'header': {'GID': EnumIntegerString.new(1, 'RF'),
             'MT': EnumIntegerString.new(1, 'ControlPacketCommand'),
             'OID': EnumIntegerString.new(3, 'RF_DISCOVER'),
@@ -817,16 +609,16 @@
                                   'RF_Technology_and_Mode': EnumIntegerString.new(130, 'NFC_F_PASSIVE_LISTEN_MODE')}]},
  'payload_length': 13}" </msg>
 <doc>Writes binary data to a file or sends it over a socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.069252" elapsed="0.002946"/>
+<status status="PASS" start="2024-12-18T11:38:47.129518" elapsed="0.003218"/>
 </kw>
-<kw name="Expect Status OK response from ${NCI_READ}" source_name="Expect Status OK response from ${NCI_READ}">
-<kw name="Receive message from NCI from ${NCI_READ}" source_name="Receive message from NCI from ${NCI_READ}">
-<kw name="Wait For Data From Nci" owner="nci_interface">
-<doc>Waits for data from the NCI device.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.074380" elapsed="0.000295"/>
+<kw name="Expect Status OK response from ${NFC_INTERFACE}" source_name="Expect Status OK response from ${nfc_INTERFACE}">
+<kw name="Receive message from nfc from ${nfc_INTERFACE}" source_name="Receive message from nfc from ${nfc_INTERFACE}">
+<kw name="Wait For Data From Nfc" owner="nfc_interface">
+<doc>Waits for data from the NFC device.</doc>
+<status status="PASS" start="2024-12-18T11:38:47.135011" elapsed="0.000282"/>
 </kw>
-<kw name="Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
-<msg time="2024-12-10T11:00:50.076341" level="INFO">parsed: Container: 
+<kw name="Parse '${nfc_INTERFACE}' Using Construct '${nfcControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
+<msg time="2024-12-18T11:38:47.136820" level="INFO">parsed: Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -835,8 +627,8 @@
         OID = (enum) RF_DISCOVER 3
     payload_length = 1
     payload = Container: 
-        Status = (enum) STATUS_OK 0 using &lt;Compiled NCI_CONTROL_PACKET&gt; from 41 03 01 00</msg>
-<msg time="2024-12-10T11:00:50.076715" level="INFO">${RESPONSE} = Container: 
+        Status = (enum) STATUS_OK 0 using &lt;Compiled NFC_CONTROL_PACKET&gt; from 41 03 01 00</msg>
+<msg time="2024-12-18T11:38:47.137131" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -846,13 +638,13 @@
     pa...</msg>
 <var>${RESPONSE}</var>
 <doc>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.075187" elapsed="0.001584"/>
+<status status="PASS" start="2024-12-18T11:38:47.135703" elapsed="0.001512"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:50.076939" elapsed="0.000082"/>
+<status status="PASS" start="2024-12-18T11:38:47.137372" elapsed="0.000093"/>
 </return>
-<msg time="2024-12-10T11:00:50.077471" level="INFO">${RESPONSE} = Container: 
+<msg time="2024-12-18T11:38:47.137982" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketResponse 2
         PBF = (enum) endOfMessage 0
@@ -861,42 +653,30 @@
         OID = (enum) RF_DISCOVER 3
     pa...</msg>
 <var>${RESPONSE}</var>
-<status status="PASS" start="2024-12-10T11:00:50.073695" elapsed="0.003830"/>
+<status status="PASS" start="2024-12-18T11:38:47.134265" elapsed="0.003779"/>
 </kw>
 <kw name="Element 'payload.Status' in '${RESPONSE}' should be equal to '${GENERIC_STATUS_CODE.STATUS_OK}'" owner="robotframework_construct" source_name="Element '${locator}' in '${constructDict}' should be equal to '${expectedValue}'">
-<msg time="2024-12-10T11:00:50.079863" level="INFO">descending to 'payload' of 'Container: 
-    header = Container: 
-        MT = (enum) ControlPacketResponse 2
-        PBF = (enum) endOfMessage 0
-        GID = (enum) RF 1
-        RFU = 0
-        OID = (enum) RF_DISCOVER 3
-    payload_length = 1
-    payload = Container: 
-        Status = (enum) STATUS_OK 0'</msg>
-<msg time="2024-12-10T11:00:50.079961" level="INFO">descending to 'Status' of 'Container: 
-    Status = (enum) STATUS_OK 0'</msg>
 <doc>Checks that the element located at locator in construct is equal to expectedValue.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.078001" elapsed="0.002061"/>
+<status status="PASS" start="2024-12-18T11:38:47.138485" elapsed="0.002121"/>
 </kw>
 <return>
 <value>${RESPONSE}</value>
-<status status="PASS" start="2024-12-10T11:00:50.080205" elapsed="0.000116"/>
+<status status="PASS" start="2024-12-18T11:38:47.140840" elapsed="0.000215"/>
 </return>
-<status status="PASS" start="2024-12-10T11:00:50.072845" elapsed="0.007687"/>
+<status status="PASS" start="2024-12-18T11:38:47.133408" elapsed="0.007929"/>
 </kw>
 <kw name="Log To Console" owner="BuiltIn">
 <arg>please place a card on the reader</arg>
 <doc>Logs the given message to the console.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.080962" elapsed="0.000335"/>
+<status status="PASS" start="2024-12-18T11:38:47.141841" elapsed="0.000558"/>
 </kw>
-<kw name="Wait For Data From Nci" owner="nci_interface">
+<kw name="Wait For Data From Nfc" owner="nfc_interface">
 <arg>timeout=1</arg>
-<doc>Waits for data from the NCI device.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.081703" elapsed="0.379097"/>
+<doc>Waits for data from the NFC device.</doc>
+<status status="PASS" start="2024-12-18T11:38:47.142696" elapsed="0.378653"/>
 </kw>
-<kw name="Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
-<msg time="2024-12-10T11:00:50.462958" level="INFO">parsed: Container: 
+<kw name="Parse '${NFC_INTERFACE}' Using Construct '${NFCControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
+<msg time="2024-12-18T11:38:47.523763" level="INFO">parsed: Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -906,8 +686,8 @@
     payload_length = 14
     payload = Container: 
         NumTargets = 1
-        Payload = b'\x04\x00\t\x02\x00\x04BZ\xb8\x00\x018\x02' (total 13) using &lt;Compiled NCI_CONTROL_PACKET&gt; from 61 03 0e 01 04 00 09 02 00 04 42 5a b8 00 01 38 02</msg>
-<msg time="2024-12-10T11:00:50.463606" level="INFO">${RESPONSE} = Container: 
+        Payload = b'\x04\x00\t\x02\x00\x04BZ\xb8\x00\x018\x02' (total 13) using &lt;Compiled NFC_CONTROL_PACKET&gt; from 61 03 0e 01 04 00 09 02 00 04 42 5a b8 00 01 38 02</msg>
+<msg time="2024-12-18T11:38:47.524335" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -917,15 +697,15 @@
   ...</msg>
 <var>${RESPONSE}</var>
 <doc>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.461649" elapsed="0.002112"/>
+<status status="PASS" start="2024-12-18T11:38:47.522215" elapsed="0.002233"/>
 </kw>
-<kw name="Wait For Data From Nci" owner="nci_interface">
+<kw name="Wait For Data From Nfc" owner="nfc_interface">
 <arg>timeout=1</arg>
-<doc>Waits for data from the NCI device.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.464333" elapsed="0.000539"/>
+<doc>Waits for data from the NFC device.</doc>
+<status status="PASS" start="2024-12-18T11:38:47.525142" elapsed="0.000407"/>
 </kw>
-<kw name="Parse '${NCI_READ}' Using Construct '${NCIControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
-<msg time="2024-12-10T11:00:50.467510" level="INFO">parsed: Container: 
+<kw name="Parse '${NFC_INTERFACE}' Using Construct '${nfcControlPacket}'" owner="robotframework_construct" source_name="Parse '${binarydata}' using construct '${identifier}'">
+<msg time="2024-12-18T11:38:47.527776" level="INFO">parsed: Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -935,8 +715,8 @@
     payload_length = 17
     payload = Container: 
         NumTargets = 2
-        Payload = b'\x06\x06\x0c\x00\x02@\xce\xa1\x18f$\x16\xe0\xab\xa4\x00' (total 16) using &lt;Compiled NCI_CONTROL_PACKET&gt; from 61 03 11 02 06 06 0c 00 02 40 ce a1 18 66 24 16 e0 ab a4 00</msg>
-<msg time="2024-12-10T11:00:50.467950" level="INFO">${RESPONSE} = Container: 
+        Payload = b'\x06\x06\x0c\x00\x02@\xce\xa1\x18f$\x16\xe0\xab\xa4\x00' (total 16) using &lt;Compiled NFC_CONTROL_PACKET&gt; from 61 03 11 02 06 06 0c 00 02 40 ce a1 18 66 24 16 e0 ab a4 00</msg>
+<msg time="2024-12-18T11:38:47.528356" level="INFO">${RESPONSE} = Container: 
     header = Container: 
         MT = (enum) ControlPacketNotification 3
         PBF = (enum) endOfMessage 0
@@ -946,20 +726,20 @@
   ...</msg>
 <var>${RESPONSE}</var>
 <doc>Parses binary data using a construct. The binary data can be a byte array, a readable binary file object, or a TCP/UDP socket.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.465780" elapsed="0.002248"/>
+<status status="PASS" start="2024-12-18T11:38:47.526259" elapsed="0.002151"/>
 </kw>
-<kw name="Close Nci Connection" owner="nci_interface" type="TEARDOWN">
-<doc>Closes the NCI connection by closing the serial connection.</doc>
-<status status="PASS" start="2024-12-10T11:00:50.468776" elapsed="0.006748"/>
+<kw name="Close Nfc Connection" owner="nfc_interface" type="TEARDOWN">
+<doc>Closes the NFC connection by closing the serial connection.</doc>
+<status status="PASS" start="2024-12-18T11:38:47.529320" elapsed="0.011387"/>
 </kw>
-<doc>This test case resets the NFC options using NCI over UART.</doc>
+<doc>This test case resets the NFC options using nfc over UART.</doc>
 <tag>hardware</tag>
-<status status="PASS" start="2024-12-10T11:00:49.768754" elapsed="0.707046"/>
+<status status="PASS" start="2024-12-18T11:38:46.829152" elapsed="0.711955"/>
 </test>
-<doc>This is a simple example for a robot file using robotframework-construct using nfc/nci as an example using UART.</doc>
-<status status="PASS" start="2024-12-10T11:00:49.038174" elapsed="1.438943"/>
+<doc>This is a simple example for a robot file using robotframework-construct using nfc/nfc as an example using UART.</doc>
+<status status="PASS" start="2024-12-18T11:38:46.144677" elapsed="1.397955"/>
 </suite>
-<status status="PASS" start="2024-12-10T11:00:49.000485" elapsed="1.478741"/>
+<status status="PASS" start="2024-12-18T11:38:46.105525" elapsed="1.440016"/>
 </suite>
 <statistics>
 <total>
@@ -969,8 +749,8 @@
 <stat pass="3" fail="0" skip="0">hardware</stat>
 </tag>
 <suite>
-<stat pass="3" fail="0" skip="0" id="s1" name="Nfc Nci">Nfc Nci</stat>
-<stat pass="3" fail="0" skip="0" id="s1-s1" name="Nfc Basic">Nfc Nci.Nfc Basic</stat>
+<stat pass="3" fail="0" skip="0" id="s1" name="Nfc">Nfc</stat>
+<stat pass="3" fail="0" skip="0" id="s1-s1" name="Nfc Basic">Nfc.Nfc Basic</stat>
 </suite>
 </statistics>
 <errors>
diff --git a/atests/hw_dependant_results/nfc/report.html b/atests/hw_dependant_results/nfc/report.html
index 6a66332..6a214d1 100644
--- a/atests/hw_dependant_results/nfc/report.html
+++ b/atests/hw_dependant_results/nfc/report.html
@@ -1887,22 +1887,22 @@
 window.output = {};
 </script>
 <script type="text/javascript">
-window.output["suite"] = [1,2,3,0,[],[1,0,1479],[[4,5,6,7,[],[1,38,1439],[],[[8,0,9,[10],[1,150,317],[]],[11,0,12,[10],[1,468,300],[]],[13,0,14,[10],[1,769,707],[]]],[],[3,3,0,0]]],[],[],[3,3,0,0]];
+window.output["suite"] = [1,2,3,0,[],[1,0,1440],[[4,5,6,7,[],[1,39,1398],[],[[8,0,9,[10],[1,114,306],[]],[11,0,12,[10],[1,421,301],[]],[13,0,14,[10],[1,723,712],[]]],[],[3,3,0,0]]],[],[],[3,3,0,0]];
 </script>
 <script type="text/javascript">
 window.output["strings"] = [];
 </script>
 <script type="text/javascript">
-window.output["strings"] = window.output["strings"].concat(["*","*Nfc Nci","*/home/franz/projects/robotframework-construct/atests/nfc_nci","*../nfc_nci","*Nfc Basic","*/home/franz/projects/robotframework-construct/atests/nfc_nci/nfc_basic.robot","*../nfc_nci/nfc_basic.robot","*<p>This is a simple example for a robot file using robotframework-construct using nfc/nci as an example using UART.\x3c/p>","*Reset NFC Reseting RF configuration","*<p>This test case resets the NFC options using NCI over UART reseting the RF configuration.\x3c/p>","*hardware","*Reset NFC keeping RF configuration","*<p>This test case resets the NFC options using NCI over UART keeping the RF configuration.\x3c/p>","*Actively poll for A cards","*<p>This test case resets the NFC options using NCI over UART.\x3c/p>"]);
+window.output["strings"] = window.output["strings"].concat(["*","*Nfc","*/home/franz/projects/robotframework-construct/atests/nfc","*../../nfc","*Nfc Basic","*/home/franz/projects/robotframework-construct/atests/nfc/nfc_basic.robot","*../../nfc/nfc_basic.robot","*<p>This is a simple example for a robot file using robotframework-construct using nfc/nfc as an example using UART.\x3c/p>","*Reset NFC Reseting RF configuration","*<p>This test case resets the NFC options using nfc over UART reseting the RF configuration.\x3c/p>","*hardware","*Reset NFC keeping RF configuration","*<p>This test case resets the NFC options using nfc over UART keeping the RF configuration.\x3c/p>","*Actively poll for A cards","*<p>This test case resets the NFC options using nfc over UART.\x3c/p>"]);
 </script>
 <script type="text/javascript">
-window.output["stats"] = [[{"elapsed":"00:00:01","fail":0,"label":"All Tests","pass":3,"skip":0}],[{"elapsed":"00:00:01","fail":0,"label":"hardware","pass":3,"skip":0}],[{"elapsed":"00:00:01","fail":0,"id":"s1","label":"Nfc Nci","name":"Nfc Nci","pass":3,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s1","label":"Nfc Nci.Nfc Basic","name":"Nfc Basic","pass":3,"skip":0}]];
+window.output["stats"] = [[{"elapsed":"00:00:01","fail":0,"label":"All Tests","pass":3,"skip":0}],[{"elapsed":"00:00:01","fail":0,"label":"hardware","pass":3,"skip":0}],[{"elapsed":"00:00:01","fail":0,"id":"s1","label":"Nfc","name":"Nfc","pass":3,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s1","label":"Nfc.Nfc Basic","name":"Nfc Basic","pass":3,"skip":0}]];
 </script>
 <script type="text/javascript">
-window.output["baseMillis"] = 1733824849000;
+window.output["baseMillis"] = 1734518326106;
 </script>
 <script type="text/javascript">
-window.output["generated"] = 1513;
+window.output["generated"] = 1470;
 </script>
 <script type="text/javascript">
 window.output["expand_keywords"] = null;
diff --git a/atests/nfc_nci/nci.py b/atests/nfc/nfc.py
similarity index 93%
rename from atests/nfc_nci/nci.py
rename to atests/nfc/nfc.py
index 1469845..1812664 100644
--- a/atests/nfc_nci/nci.py
+++ b/atests/nfc/nfc.py
@@ -17,7 +17,7 @@
               NFCEE=2,
               Proprietary=0xF)
 
-OID_NCI_Core = Enum(BitsInteger(6),
+OID_NFC_Core = Enum(BitsInteger(6),
                     CORE_RESET=0,
                     CORE_INIT=1,
                     CORE_SET_CONFIG=2,
@@ -129,11 +129,11 @@
     RFU_255=255  # RFU (Value 255)
 ) # Table 53
 
-CONFIGURATION_STATUS = Enum(Byte,NCI_RF_CONFIGURATION_KEPT=0,
-                                 NCI_RF_CONFIGURATION_RESET=1) # Table 7
+CONFIGURATION_STATUS = Enum(Byte,NFC_RF_CONFIGURATION_KEPT=0,
+                                 NFC_RF_CONFIGURATION_RESET=1) # Table 7
 
-NCI_VERSION = Enum(Byte, NCI_VERSION_1_0=0x10,
-                         NCI_VERSION_2_0=0x20) # Table 6
+NFC_VERSION = Enum(Byte, NFC_VERSION_1_0=0x10,
+                         NFC_VERSION_2_0=0x20) # Table 6
 
 CORE_RESET_NTF_STATUS_REASON_CODE = Enum(Byte, UNSPECIFIED=0x00,
                                                CORE_RESET_TRIGGERED=0x01)
@@ -232,7 +232,7 @@
                                "Manufacturer_specific_info"       / Bytes(4))
 
 CORE_RESET_RSP = Struct("Status"               / If(this._.payload_length>=1, CORE_RESET_RSP_STATUS),
-                        "NCI_Version"          / If(this._.payload_length>=2, NCI_VERSION),
+                        "NFC_Version"          / If(this._.payload_length>=2, NFC_VERSION),
                         "ConfigurationStatus"  / If(this._.payload_length>=3, CONFIGURATION_STATUS),
                         "padding"              / If(this._.payload_length> 3, Bytes(this._.payload_length-3)))
 
@@ -240,7 +240,7 @@
                         "ConfigurationStatus" / CONFIGURATION_STATUS,
                         "padding"              / If(this._.payload_length> 2, Bytes(this._.payload_length-2)))
 
-NCI_DATA_PACKET = Struct(
+NFC_DATA_PACKET = Struct(
     "header"            / BitStruct(
         "MT"            / MT,
         "PBF"           / PBF,
@@ -254,30 +254,30 @@
 
 CORE_RESET_CMD_PAYLOAD = Struct("ResetType" / CORE_RESET_CMD)
 
-NCI_CONTROL_PACKET = Struct(
+NFC_CONTROL_PACKET = Struct(
     "header" / BitStruct("MT" / MT,
                          "PBF" / PBF,
                          "GID" / GID,
                          "RFU" / BitsInteger(2),
-                         "OID" / Switch(this.GID, {GID.CORE: OID_NCI_Core, GID.RF: OID_RF_Management, GID.NFCEE: OID_NFCEE_Management})),
+                         "OID" / Switch(this.GID, {GID.CORE: OID_NFC_Core, GID.RF: OID_RF_Management, GID.NFCEE: OID_NFCEE_Management})),
     "payload_length" / Int8ub,
-    "payload" / Switch((this.header.MT, this.header.GID, this.header.OID,), {(MT.ControlPacketCommand,      GID.CORE, OID_NCI_Core.CORE_RESET,):         CORE_RESET_CMD_PAYLOAD,
-                                                                             (MT.ControlPacketResponse,     GID.CORE, OID_NCI_Core.CORE_RESET,):         CORE_RESET_RSP,
-                                                                             (MT.ControlPacketNotification, GID.CORE, OID_NCI_Core.CORE_RESET,):         CORE_RESET_NTF,
-                                                                             (MT.ControlPacketCommand,      GID.CORE, OID_NCI_Core.CORE_INIT,):          CORE_INIT_CMD_PAYLOAD,
-                                                                             (MT.ControlPacketResponse,     GID.CORE, OID_NCI_Core.CORE_INIT,):          CORE_INIT_RSP_PAYLOAD,
+    "payload" / Switch((this.header.MT, this.header.GID, this.header.OID,), {(MT.ControlPacketCommand,      GID.CORE, OID_NFC_Core.CORE_RESET,):         CORE_RESET_CMD_PAYLOAD,
+                                                                             (MT.ControlPacketResponse,     GID.CORE, OID_NFC_Core.CORE_RESET,):         CORE_RESET_RSP,
+                                                                             (MT.ControlPacketNotification, GID.CORE, OID_NFC_Core.CORE_RESET,):         CORE_RESET_NTF,
+                                                                             (MT.ControlPacketCommand,      GID.CORE, OID_NFC_Core.CORE_INIT,):          CORE_INIT_CMD_PAYLOAD,
+                                                                             (MT.ControlPacketResponse,     GID.CORE, OID_NFC_Core.CORE_INIT,):          CORE_INIT_RSP_PAYLOAD,
                                                                              (MT.ControlPacketCommand,      GID.RF, OID_RF_Management.RF_DISCOVER,):     RF_DISCOVER_CMD_PAYLOAD,
                                                                              (MT.ControlPacketResponse,     GID.RF, OID_RF_Management.RF_DISCOVER,):    RF_DISCOVER_RSP_PAYLOAD,
                                                                              (MT.ControlPacketNotification, GID.RF, OID_RF_Management.RF_DISCOVER,):    RF_DISCOVER_NTF_PAYLOAD,
                                                                              })).compile()
-NCI_CONTROL_PACKET.name = "NCI_CONTROL_PACKET"
+NFC_CONTROL_PACKET.name = "NFC_CONTROL_PACKET"
 
 
 NFC_RST_CMD=   {"header": {"MT": MT.ControlPacketCommand,
                                  "PBF": 0,
                                  "GID": GID.CORE,
                                  "RFU": 0,
-                                 "OID": OID_NCI_Core.CORE_RESET},
+                                 "OID": OID_NFC_Core.CORE_RESET},
                       "payload_length": 1,
                       "payload": {"ResetType": CORE_RESET_CMD.RESET_CONFIGURATION},
                       "padding": b""}
@@ -286,14 +286,14 @@
                                  "PBF": 0,
                                  "GID": GID.CORE,
                                  "RFU": 0,
-                                 "OID": OID_NCI_Core.CORE_INIT},
+                                 "OID": OID_NFC_Core.CORE_INIT},
                       "payload_length": 2,
                       "payload": {"ConstValue": b"\x00\x00"},
                       "padding": b""}
 
 
 
-NCI_DISCVER_CMD = {"header": {"MT": MT.ControlPacketCommand,
+NFC_DISCVER_CMD = {"header": {"MT": MT.ControlPacketCommand,
                                   "PBF": 0,
                                   "GID": GID.RF,
                                   "RFU": 0,
diff --git a/atests/nfc/nfc_basic.robot b/atests/nfc/nfc_basic.robot
new file mode 100644
index 0000000..d604408
--- /dev/null
+++ b/atests/nfc/nfc_basic.robot
@@ -0,0 +1,70 @@
+*** Settings ***
+Documentation      This is a simple example for a robot file using robotframework-construct using nfc/nfc as an example using UART.
+Variables          nfc.py
+Library            nfc_interface
+Library            robotframework_construct
+Test Teardown      Close nfc Connection
+Default Tags       hardware
+*** Variables ***
+${NFC_INTERFACE}    /dev/serial/by-id/usb-STMicroelectronics_STM32_STLink_066EFF3031454D3043225321-if02
+${BAUD_RATE}        115200
+
+*** Test Cases ***
+Reset NFC Reseting RF configuration
+    [Documentation]    This test case resets the NFC options using nfc over UART reseting the RF configuration.
+    ${NFC_INTERFACE}=    Open nfc Connection Via UART    ${NFC_INTERFACE}    ${BAUD_RATE}
+    Sleep    0.25
+    Empty nfc Connection Receive Buffer
+    Modify the element located at 'payload.ResetType' of '${NFC_RST_CMD}' to '${CORE_RESET_CMD.RESET_CONFIGURATION}'
+    Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${nfcControlPacket}' To '${NFC_INTERFACE}'
+    Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketResponse}
+    ${RESET_NOTIFICATION}=    Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketNotification}
+    Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NFC_RF_CONFIGURATION_RESET}'
+    NFC Connection Receive Buffer Should Be Empty
+
+Reset NFC keeping RF configuration
+    [Documentation]    This test case resets the NFC options using nfc over UART keeping the RF configuration.
+    ${NFC_INTERFACE} =    Open nfc Connection Via UART    ${NFC_INTERFACE}    ${BAUD_RATE}
+    Sleep    0.25
+    Empty NFC Connection Receive Buffer
+    Modify the element located at 'payload.ResetType' of '${NFC_RST_CMD}' to '${CORE_RESET_CMD.KEEP_CONFIGURATION}'
+    Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${nfcControlPacket}' To '${NFC_INTERFACE}'
+    Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketResponse}
+    ${RESET_NOTIFICATION}=    Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketNotification}
+    Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NFC_RF_CONFIGURATION_KEPT}'
+    NFC Connection Receive Buffer Should Be Empty
+
+Actively poll for A cards
+    [Documentation]    This test case resets the NFC options using nfc over UART.
+    ${NFC_INTERFACE}=    Open NFC Connection Via UART    ${NFC_INTERFACE}    ${BAUD_RATE}
+    Sleep    0.25
+    Empty NFC Connection Receive Buffer
+    Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${nfcControlPacket}' To '${NFC_INTERFACE}'
+    Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketResponse}
+    Expect Response from ${NFC_INTERFACE} of type ${MT.ControlPacketNotification}
+    Write Binary Data Generated From '${NFC_INIT_CMD}' Using Construct '${nfcControlPacket}' To '${NFC_INTERFACE}'
+    Expect Status OK response from ${NFC_INTERFACE}
+    Write Binary Data Generated From '${NFC_DISCVER_CMD}' Using Construct '${NFCControlPacket}' To '${NFC_INTERFACE}'
+    Expect Status OK response from ${NFC_INTERFACE}
+    Log to console            please place a card on the reader
+    Wait For Data From NFC    timeout=1
+    ${RESPONSE}=     Parse '${NFC_INTERFACE}' Using Construct '${NFCControlPacket}'
+    Wait For Data From NFC    timeout=1
+    ${RESPONSE}=     Parse '${NFC_INTERFACE}' Using Construct '${nfcControlPacket}'
+
+*** Keywords ***
+Receive message from nfc from ${nfc_INTERFACE}
+    Wait For Data From nfc
+    ${RESPONSE}=     Parse '${nfc_INTERFACE}' Using Construct '${nfcControlPacket}'
+    RETURN    ${RESPONSE}
+
+Expect Status OK response from ${nfc_INTERFACE}
+    ${RESPONSE}=      Receive message from nfc from ${nfc_INTERFACE}
+    Element 'payload.Status' in '${RESPONSE}' should be equal to '${GENERIC_STATUS_CODE.STATUS_OK}'
+    RETURN    ${RESPONSE}
+
+Expect Response from ${nfc_INTERFACE} of type ${EXPECTED_MT}
+    ${RESPONSE}=     Receive message from nfc from ${nfc_INTERFACE}
+    Element 'header.MT' in '${RESPONSE}' should be equal to '${EXPECTED_MT}'
+    RETURN    ${RESPONSE}
+
diff --git a/atests/nfc_nci/nci_interface.py b/atests/nfc/nfc_interface.py
similarity index 75%
rename from atests/nfc_nci/nci_interface.py
rename to atests/nfc/nfc_interface.py
index 5f84d79..6238803 100644
--- a/atests/nfc_nci/nci_interface.py
+++ b/atests/nfc/nfc_interface.py
@@ -4,13 +4,13 @@
 import time
 
 
-class nci_interface():
+class nfc_interface():
     def __init__(self):
         self._serial_connection = None
 
-    def open_nci_connection_via_uart(self, device: str, baudrate: int, timeout=1.0):
+    def open_nfc_connection_via_uart(self, device: str, baudrate: int, timeout=1.0):
         """
-        Opens a connection to a NCI device via UART.
+        Opens a connection to a NFC device via UART.
 
         Returns a tuple of two file objects, first one for reading and second one for writing.
         """
@@ -26,11 +26,11 @@ def read(self, size=1):
         return self._serial_connection # Alternatively, on linux we can use self._serial_connection.fileno() + select instead of the timeout read...
 
 
-    def wait_for_data_from_nci(self, timeout: float = 1.0):
+    def wait_for_data_from_nfc(self, timeout: float = 1.0):
         """
-        Waits for data from the NCI device.
+        Waits for data from the NFC device.
 
-        Raises an exception if the NCI connection is not open.
+        Raises an exception if the NFC connection is not open.
         """
         if self._serial_connection and self._serial_connection.is_open:
             try:
@@ -40,26 +40,26 @@ def wait_for_data_from_nci(self, timeout: float = 1.0):
                     endTime = time.time() + timeout
                     while time.time() < endTime and not self._serial_connection.in_waiting:
                         time.sleep(0.001)
-                    assert self._serial_connection.in_waiting, "Timeout while waiting for data from NCI device"
+                    assert self._serial_connection.in_waiting, "Timeout while waiting for data from NFC device"
         else:
-            raise Exception("NCI connection is not open")
+            raise Exception("NFC connection is not open")
 
-    def close_nci_connection(self):
+    def close_nfc_connection(self):
         """
-        Closes the NCI connection by closing the serial connection.
+        Closes the NFC connection by closing the serial connection.
         """
         if self._serial_connection and self._serial_connection.is_open:
             self._serial_connection.close()
         else:
-            raise Exception("NCI connection is not open")
+            raise Exception("NFC connection is not open")
 
-    def nci_connection_receive_buffer_should_be_empty(self):
+    def nfc_connection_receive_buffer_should_be_empty(self):
         """
         Verifies that the receive buffer is empty.
         """
         assert 0 == self._serial_connection.in_waiting
 
-    def empty_nci_connection_receive_buffer(self):
+    def empty_nfc_connection_receive_buffer(self):
         """
         Empties the receive buffer.
 
diff --git a/atests/nfc_nci/nfc_basic.robot b/atests/nfc_nci/nfc_basic.robot
deleted file mode 100644
index b5742ea..0000000
--- a/atests/nfc_nci/nfc_basic.robot
+++ /dev/null
@@ -1,71 +0,0 @@
-*** Settings ***
-Documentation      This is a simple example for a robot file using robotframework-construct using nfc/nci as an example using UART.
-Variables          nci.py
-Library            nci_interface
-Library            nci
-Library            robotframework_construct
-Test Teardown      Close NCI Connection
-Default Tags       hardware
-*** Variables ***
-${NCI_INTERFACE}    /dev/serial/by-id/usb-STMicroelectronics_STM32_STLink_066EFF3031454D3043225321-if02
-${BAUD_RATE}        115200
-
-*** Test Cases ***
-Reset NFC Reseting RF configuration
-    [Documentation]    This test case resets the NFC options using NCI over UART reseting the RF configuration.
-    ${NCI_INTERFACE}=    Open NCI Connection Via UART    ${NCI_INTERFACE}    ${BAUD_RATE}
-    Sleep    0.25
-    Empty Nci Connection Receive Buffer
-    Modify the element located at 'payload.ResetType' of '${NFC_RST_CMD}' to '${CORE_RESET_CMD.RESET_CONFIGURATION}'
-    Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_INTERFACE}'
-    Expect Response from ${NCI_INTERFACE} of type ${MT.ControlPacketResponse}
-    ${RESET_NOTIFICATION}=    Expect Response from ${NCI_INTERFACE} of type ${MT.ControlPacketNotification}
-    Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NCI_RF_CONFIGURATION_RESET}'
-    Nci Connection Receive Buffer Should Be Empty
-
-Reset NFC keeping RF configuration
-    [Documentation]    This test case resets the NFC options using NCI over UART keeping the RF configuration.
-    ${NCI_INTERFACE} =    Open NCI Connection Via UART    ${NCI_INTERFACE}    ${BAUD_RATE}
-    Sleep    0.25
-    Empty Nci Connection Receive Buffer
-    Modify the element located at 'payload.ResetType' of '${NFC_RST_CMD}' to '${CORE_RESET_CMD.KEEP_CONFIGURATION}'
-    Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_INTERFACE}'
-    Expect Response from ${NCI_INTERFACE} of type ${MT.ControlPacketResponse}
-    ${RESET_NOTIFICATION}=    Expect Response from ${NCI_INTERFACE} of type ${MT.ControlPacketNotification}
-    Element 'payload.ConfigurationStatus' in '${RESET_NOTIFICATION}' should be equal to '${CONFIGURATION_STATUS.NCI_RF_CONFIGURATION_KEPT}'
-    Nci Connection Receive Buffer Should Be Empty
-
-Actively poll for A cards
-    [Documentation]    This test case resets the NFC options using NCI over UART.
-    ${NCI_INTERFACE}=    Open NCI Connection Via UART    ${NCI_INTERFACE}    ${BAUD_RATE}
-    Sleep    0.25
-    Empty Nci Connection Receive Buffer
-    Write Binary Data Generated From '${NFC_RST_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_INTERFACE}'
-    Expect Response from ${NCI_INTERFACE} of type ${MT.ControlPacketResponse}
-    Expect Response from ${NCI_INTERFACE} of type ${MT.ControlPacketNotification}
-    Write Binary Data Generated From '${NFC_INIT_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_INTERFACE}'
-    Expect Status OK response from ${NCI_INTERFACE}
-    Write Binary Data Generated From '${NCI_DISCVER_CMD}' Using Construct '${NCIControlPacket}' To '${NCI_INTERFACE}'
-    Expect Status OK response from ${NCI_INTERFACE}
-    Log to console            please place a card on the reader
-    Wait For Data From NCI    timeout=1
-    ${RESPONSE}=     Parse '${NCI_INTERFACE}' Using Construct '${NCIControlPacket}'
-    Wait For Data From NCI    timeout=1
-    ${RESPONSE}=     Parse '${NCI_INTERFACE}' Using Construct '${NCIControlPacket}'
-
-*** Keywords ***
-Receive message from NCI from ${NCI_INTERFACE}
-    Wait For Data From NCI
-    ${RESPONSE}=     Parse '${NCI_INTERFACE}' Using Construct '${NCIControlPacket}'
-    RETURN    ${RESPONSE}
-
-Expect Status OK response from ${NCI_INTERFACE}
-    ${RESPONSE}=      Receive message from NCI from ${NCI_INTERFACE}
-    Element 'payload.Status' in '${RESPONSE}' should be equal to '${GENERIC_STATUS_CODE.STATUS_OK}'
-    RETURN    ${RESPONSE}
-
-Expect Response from ${NCI_INTERFACE} of type ${EXPECTED_MT}
-    ${RESPONSE}=     Receive message from NCI from ${NCI_INTERFACE}
-    Element 'header.MT' in '${RESPONSE}' should be equal to '${EXPECTED_MT}'
-    RETURN    ${RESPONSE}
-