diff --git a/bacnet-stack/demo/object/ao.c b/bacnet-stack/demo/object/ao.c
index 8ffe89a8..272f719a 100644
--- a/bacnet-stack/demo/object/ao.c
+++ b/bacnet-stack/demo/object/ao.c
@@ -526,12 +526,20 @@ bool WPValidateArgType(
     BACNET_ERROR_CLASS * pErrorClass,
     BACNET_ERROR_CODE * pErrorCode)
 {
-    pValue = pValue;
-    ucExpectedTag = ucExpectedTag;
-    pErrorClass = pErrorClass;
-    pErrorCode = pErrorCode;
+     bool bResult;
 
-    return false;
+     /*
+      * start out assuming success and only set up error
+      * response if validation fails.
+      */
+     bResult = true;
+     if (pValue->tag != ucExpectedTag)  {
+         bResult = false;
+        *pErrorClass = ERROR_CLASS_PROPERTY;
+        *pErrorCode = ERROR_CODE_INVALID_DATA_TYPE;
+     }
+   
+     return (bResult);
 }
 
 void testAnalogOutput(
diff --git a/bacnet-stack/demo/object/lc.c b/bacnet-stack/demo/object/lc.c
index 2db44515..4806bc14 100644
--- a/bacnet-stack/demo/object/lc.c
+++ b/bacnet-stack/demo/object/lc.c
@@ -1467,6 +1467,7 @@ void testLoadControl(
     uint32_t decoded_instance = 0;
     BACNET_READ_PROPERTY_DATA rpdata;
 
+    Analog_Output_Init();
     Load_Control_Init();
     rpdata.application_data = &apdu[0];
     rpdata.application_data_len = sizeof(apdu);
diff --git a/bacnet-stack/src/address.c b/bacnet-stack/src/address.c
index fe19abde..3645992e 100644
--- a/bacnet-stack/src/address.c
+++ b/bacnet-stack/src/address.c
@@ -1045,6 +1045,7 @@ static void set_file_address(
     }
 }
 
+#ifdef BACNET_ADDRESS_CACHE_FILE
 void testAddressFile(
     Test * pTest)
 {
@@ -1091,6 +1092,7 @@ void testAddressFile(
     ct_test(pTest, bacnet_address_same(&test_address, &src));
 
 }
+#endif
 
 void testAddress(
     Test * pTest)
@@ -1152,8 +1154,10 @@ int main(
     /* individual tests */
     rc = ct_addTestFunction(pTest, testAddress);
     assert(rc);
+#ifdef BACNET_ADDRESS_CACHE_FILE
     rc = ct_addTestFunction(pTest, testAddressFile);
     assert(rc);
+#endif
 
 
     ct_setStream(pTest, stdout);
diff --git a/bacnet-stack/test/address.mak b/bacnet-stack/test/address.mak
index 67906d28..fd97e325 100644
--- a/bacnet-stack/test/address.mak
+++ b/bacnet-stack/test/address.mak
@@ -2,7 +2,7 @@
 CC      = gcc
 SRC_DIR = ../src
 INCLUDES = -I../include -I.
-DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ADDRESS
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ADDRESS -DBACNET_ADDRESS_CACHE_FILE
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g