diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 08631c5..83142d9 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -495,7 +495,6 @@ zephyr_compile_definitions(
   # library features
   $<$<BOOL:${CONFIG_BACNET_BASIC_OBJECTS}>:BACNET_BASIC_OBJECTS>
   $<$<BOOL:${CONFIG_BACNET_PROPERTY_LISTS}>:BACNET_PROPERTY_LISTS=1>
-  $<$<BOOL:${CONFIG_BACNET_PROPERTY_ARRAY_LISTS}>:BACNET_PROPERTY_ARRAY_LISTS=1>
   $<$<BOOL:${CONFIG_BACNET_ROUTING}>:BACNET_ROUTING>
   $<$<BOOL:${CONFIG_BACAPP_PRINT_ENABLED}>:BACAPP_PRINT_ENABLED=1>
   $<$<BOOL:${CONFIG_BACAPP_SNPRINTF_ENABLED}>:BACAPP_SNPRINTF_ENABLED=1>
diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index a7337c7..803d698 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -50,12 +50,6 @@ config BACNET_PROPERTY_LISTS
 	help
 	  Enable BACnet Property Lists
 
-config BACNET_PROPERTY_ARRAY_LISTS
-	bool "BACnetARRAY Property Lists"
-	default true
-	help
-	  Enable BACnetARRAY Property Lists
-
 config BACDL_ETHERNET
 	bool "BACnet Ethernet datalink"
 	help
diff --git a/zephyr/samples/profiles/b-ss/prj.conf b/zephyr/samples/profiles/b-ss/prj.conf
index 9e64598..5b1bb97 100644
--- a/zephyr/samples/profiles/b-ss/prj.conf
+++ b/zephyr/samples/profiles/b-ss/prj.conf
@@ -28,7 +28,6 @@ CONFIG_BACNETSTACK_BACNET_BASIC=y
 CONFIG_BACNET_MAX_CHARACTER_STRING_BYTES=128
 CONFIG_BACAPP_MINIMAL=y
 CONFIG_BACAPP_HOST_N_PORT=y
-CONFIG_BACNET_PROPERTY_ARRAY_LISTS=y
 # BACnet Library - objects
 CONFIG_BACNET_BASIC_OBJECT_NETWORK_PORT=y
 CONFIG_BACNET_BASIC_OBJECT_ANALOG_INPUT=y
diff --git a/zephyr/tests/bacnet/bacapp/CMakeLists.txt b/zephyr/tests/bacnet/bacapp/CMakeLists.txt
index 45b78f8..12d5d25 100644
--- a/zephyr/tests/bacnet/bacapp/CMakeLists.txt
+++ b/zephyr/tests/bacnet/bacapp/CMakeLists.txt
@@ -31,6 +31,7 @@ if(BOARD STREQUAL unit_testing)
 
   get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacdcode.c
diff --git a/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt
index 1cfffd5..b1ade91 100644
--- a/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt
index 056d9d3..8da5a55 100644
--- a/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt
index 8f786c2..c84cdb0 100644
--- a/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt
index 1cfffd5..b1ade91 100644
--- a/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt
index a642f6c..858a18e 100644
--- a/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt
@@ -21,18 +21,24 @@ get_filename_component(BACNET_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 # Update include path for this module
 list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
 
+set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
+list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
+
 if(BOARD STREQUAL unit_testing)
   file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
-  list(APPEND INCLUDE ${BACNET_INCLUDE})
+  file(RELATIVE_PATH TEST_OBJECT_INCLUDE $ENV{ZEPHYR_BASE} ${TEST_OBJECT_SRC})
+  list(APPEND INCLUDE ${BACNET_INCLUDE} ${TEST_OBJECT_INCLUDE})
   list(APPEND SOURCES
     ${BACNET_SRC_PATH}.c
     ${BACNET_TEST_PATH}/src/main.c
+    ${TEST_OBJECT_SRC}/property_test.c
     )
 
   get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
@@ -48,8 +54,8 @@ if(BOARD STREQUAL unit_testing)
     ${BACNET_SRC}/bactext.c
     ${BACNET_SRC}/indtext.c
     ${BACNET_SRC}/lighting.c
+    ${BACNET_SRC}/proplist.c
     ${BACNET_SRC}/wp.c
-    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/hostnport.c
     ${BACNET_SRC}/dailyschedule.c
     ${BACNET_SRC}/weeklyschedule.c
@@ -66,9 +72,12 @@ else()
   find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
   project(${BACNET_NAME})
 
-  target_include_directories(app PRIVATE ${BACNET_INCLUDE})
+  target_include_directories(app PRIVATE
+    ${BACNET_INCLUDE}
+    ${TEST_OBJECT_INCLUDE})
   target_sources(app PRIVATE
     ${BACNET_TEST_PATH}/src/main.c
+    ${TEST_OBJECT_SRC}/property_test.c
     )
 endif()
 
diff --git a/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt
index 8f786c2..c84cdb0 100644
--- a/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt
index 8f786c2..c84cdb0 100644
--- a/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt
index 449a0be..d0aafe4 100644
--- a/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt
@@ -39,6 +39,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt
index 4d0d2cc..cac7e2a 100644
--- a/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+  ${BACNET_SRC}/access_rule.c
   ${BACNET_SRC}/bacaction.c
   ${BACNET_SRC}/bacaddr.c
   ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt
index b6c5b35..87f7a77 100644
--- a/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt
@@ -39,6 +39,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt
index 229a2fc..f0ff7ed 100644
--- a/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt
index 75efe42..ae8e000 100644
--- a/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt
index 6bd8add..d273b97 100644
--- a/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+  ${BACNET_SRC}/access_rule.c
   ${BACNET_SRC}/bacaction.c
   ${BACNET_SRC}/bacaddr.c
   ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/calendar/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/calendar/CMakeLists.txt
index 9f25c5d..a2ba130 100644
--- a/zephyr/tests/bacnet/basic/object/calendar/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/calendar/CMakeLists.txt
@@ -36,6 +36,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt
index 11d1b31..4b57da6 100644
--- a/zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt
@@ -35,6 +35,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt
index b646b29..67024c3 100644
--- a/zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt
@@ -35,6 +35,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt
index 02397f1..858a18e 100644
--- a/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt
index 7e494af..e386cff 100644
--- a/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt
index d8a3d27..c91a040 100644
--- a/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt
@@ -34,6 +34,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacerror.c
diff --git a/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt
index ceef8b0..09d2256 100644
--- a/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt
@@ -34,6 +34,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt
index eed3179..35db48c 100644
--- a/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt
@@ -35,6 +35,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt
index 344efaf..25ce35e 100644
--- a/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt
index 6bd8add..d273b97 100644
--- a/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+  ${BACNET_SRC}/access_rule.c
   ${BACNET_SRC}/bacaction.c
   ${BACNET_SRC}/bacaddr.c
   ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt
index 12824b9..4afa0bc 100644
--- a/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt
index 75efe42..ae8e000 100644
--- a/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt
index 2b3145a..cf7848d 100644
--- a/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt
index 990ac27..cae338a 100644
--- a/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt
index 8f786c2..c84cdb0 100644
--- a/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt
index 8f786c2..c84cdb0 100644
--- a/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt
index a46dba7..06be1ed 100644
--- a/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt
@@ -38,6 +38,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/basic/object/time_value/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/time_value/CMakeLists.txt
index 984c0f0..a727287 100644
--- a/zephyr/tests/bacnet/basic/object/time_value/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/time_value/CMakeLists.txt
@@ -40,6 +40,7 @@ if(BOARD STREQUAL unit_testing)
   get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
   get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/cov/CMakeLists.txt b/zephyr/tests/bacnet/cov/CMakeLists.txt
index eb5595d..22518ba 100644
--- a/zephyr/tests/bacnet/cov/CMakeLists.txt
+++ b/zephyr/tests/bacnet/cov/CMakeLists.txt
@@ -31,6 +31,7 @@ if(BOARD STREQUAL unit_testing)
 
   get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/event/CMakeLists.txt b/zephyr/tests/bacnet/event/CMakeLists.txt
index 61d3fb7..0b3522c 100644
--- a/zephyr/tests/bacnet/event/CMakeLists.txt
+++ b/zephyr/tests/bacnet/event/CMakeLists.txt
@@ -31,6 +31,7 @@ if(BOARD STREQUAL unit_testing)
 
   get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
     ${BACNET_SRC}/bacstr.c
diff --git a/zephyr/tests/bacnet/property/CMakeLists.txt b/zephyr/tests/bacnet/property/CMakeLists.txt
index 3ce8309..e6c0120 100644
--- a/zephyr/tests/bacnet/property/CMakeLists.txt
+++ b/zephyr/tests/bacnet/property/CMakeLists.txt
@@ -36,6 +36,8 @@ if(BOARD STREQUAL unit_testing)
     ${BACNET_SRC}/bacstr.c
     ${BACNET_SRC}/bacint.c
     ${BACNET_SRC}/bacreal.c
+    ${BACNET_SRC}/bactext.c
+    ${BACNET_SRC}/indtext.c
     ${BACNET_SRC}/datetime.c
     ${BACNET_SRC}/timestamp.c
     ${BACNET_SRC}/basic/sys/days.c
@@ -43,7 +45,6 @@ if(BOARD STREQUAL unit_testing)
 
   add_definitions(
     -DBACNET_PROPERTY_LISTS=1
-    -DBACNET_PROPERTY_ARRAY_LISTS=1
   )
 
   set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
diff --git a/zephyr/tests/bacnet/property/prj.conf b/zephyr/tests/bacnet/property/prj.conf
index bdb885a..3cb7c12 100644
--- a/zephyr/tests/bacnet/property/prj.conf
+++ b/zephyr/tests/bacnet/property/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_ZTEST=y
 CONFIG_BACNETSTACK=y
 CONFIG_BACNET_PROPERTY_LISTS=y
-CONFIG_BACNET_PROPERTY_ARRAY_LISTS=y
diff --git a/zephyr/tests/bacnet/property/prj.unit_testing.conf b/zephyr/tests/bacnet/property/prj.unit_testing.conf
index 32e6f1e..03e311e 100644
--- a/zephyr/tests/bacnet/property/prj.unit_testing.conf
+++ b/zephyr/tests/bacnet/property/prj.unit_testing.conf
@@ -1,4 +1,3 @@
 CONFIG_ZTEST=y
 #CONFIG_BACNETSTACK=y
 #CONFIG_BACNET_PROPERTY_LISTS=y
-#CONFIG_BACNET_PROPERTY_ARRAY_LISTS=y
diff --git a/zephyr/tests/bacnet/ptransfer/CMakeLists.txt b/zephyr/tests/bacnet/ptransfer/CMakeLists.txt
index d89e3f0..223ea1c 100644
--- a/zephyr/tests/bacnet/ptransfer/CMakeLists.txt
+++ b/zephyr/tests/bacnet/ptransfer/CMakeLists.txt
@@ -31,6 +31,7 @@ if(BOARD STREQUAL unit_testing)
 
   get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/rpm/CMakeLists.txt b/zephyr/tests/bacnet/rpm/CMakeLists.txt
index f822dc2..9e1177a 100644
--- a/zephyr/tests/bacnet/rpm/CMakeLists.txt
+++ b/zephyr/tests/bacnet/rpm/CMakeLists.txt
@@ -31,6 +31,7 @@ if(BOARD STREQUAL unit_testing)
 
   get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c
diff --git a/zephyr/tests/bacnet/wp/CMakeLists.txt b/zephyr/tests/bacnet/wp/CMakeLists.txt
index 44d554b..b2958ed 100644
--- a/zephyr/tests/bacnet/wp/CMakeLists.txt
+++ b/zephyr/tests/bacnet/wp/CMakeLists.txt
@@ -31,6 +31,7 @@ if(BOARD STREQUAL unit_testing)
 
   get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
   list(APPEND SOURCES
+    ${BACNET_SRC}/access_rule.c
     ${BACNET_SRC}/bacaction.c
     ${BACNET_SRC}/bacaddr.c
     ${BACNET_SRC}/bacapp.c