diff --git a/bacnet-stack/src/timesync.c b/bacnet-stack/src/timesync.c
index 26e48808..e285c2e3 100644
--- a/bacnet-stack/src/timesync.c
+++ b/bacnet-stack/src/timesync.c
@@ -160,8 +160,8 @@ void testTimeSyncData(Test * pTest,
     apdu_len = len;
     len = timesync_decode_apdu(&apdu[0], apdu_len, &test_date, &test_time);
     ct_test(pTest, len != -1);
-    ct_test(pTest, bacapp_same_time(my_time, &test_time));
-    ct_test(pTest, bacapp_same_date(my_date, &test_date));
+    ct_test(pTest, datetime_compare_time(my_time, &test_time) == 0);
+    ct_test(pTest, datetime_compare_date(my_date, &test_date) == 0);
 
     len = timesync_utc_encode_apdu(&apdu[0], my_date, my_time);
     ct_test(pTest, len != 0);
@@ -170,8 +170,8 @@ void testTimeSyncData(Test * pTest,
         timesync_utc_decode_apdu(&apdu[0], apdu_len, &test_date,
         &test_time);
     ct_test(pTest, len != -1);
-    ct_test(pTest, bacapp_same_time(my_time, &test_time));
-    ct_test(pTest, bacapp_same_date(my_date, &test_date));
+    ct_test(pTest, datetime_compare_time(my_time, &test_time) == 0);
+    ct_test(pTest, datetime_compare_date(my_date, &test_date) == 0);
 }
 
 void testTimeSync(Test * pTest)
diff --git a/bacnet-stack/test/ringbuf.mak b/bacnet-stack/test/ringbuf.mak
index 26c685c4..167ada68 100644
--- a/bacnet-stack/test/ringbuf.mak
+++ b/bacnet-stack/test/ringbuf.mak
@@ -1,17 +1,20 @@
-#Makefile to build ringbuf tests
+#Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_RINGBUF -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_RINGBUF
 
-OBJS    = ringbuf.o test/ctest.o
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
+
+SRCS = $(SRC_DIR)/ringbuf.c \
+	ctest.c
 
 TARGET = ringbuf
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
diff --git a/bacnet-stack/test/rp.mak b/bacnet-stack/test/rp.mak
index 0388656e..004127e0 100644
--- a/bacnet-stack/test/rp.mak
+++ b/bacnet-stack/test/rp.mak
@@ -1,24 +1,24 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DTEST -DBIG_ENDIAN=0 -DTEST_READ_PROPERTY -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_READ_PROPERTY
 
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bigend.c \
-       rp.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/rp.c \
+	ctest.c
 
 TARGET = readproperty
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
diff --git a/bacnet-stack/test/rpm.mak b/bacnet-stack/test/rpm.mak
index fcee24da..4cd356e9 100644
--- a/bacnet-stack/test/rpm.mak
+++ b/bacnet-stack/test/rpm.mak
@@ -1,28 +1,29 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_READ_PROPERTY_MULTIPLE -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_READ_PROPERTY_MULTIPLE
 
-SRCS = bacdcode.c \
-       bacerror.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       rpm.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/bacerror.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/rpm.c \
+	ctest.c
 
 TARGET = rpm
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
diff --git a/bacnet-stack/test/sbuf.mak b/bacnet-stack/test/sbuf.mak
index 385bd457..d61f20cb 100644
--- a/bacnet-stack/test/sbuf.mak
+++ b/bacnet-stack/test/sbuf.mak
@@ -1,20 +1,20 @@
-#Makefile to build ringbuf tests
+#Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_STATIC_BUFFER -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_STATIC_BUFFER
 
-SRCS = sbuf.c \
-	test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = $(SRC_DIR)/sbuf.c \
+	ctest.c
 
 TARGET = sbuf
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
diff --git a/bacnet-stack/test/timesync.mak b/bacnet-stack/test/timesync.mak
index 8ba24e85..e322e388 100644
--- a/bacnet-stack/test/timesync.mak
+++ b/bacnet-stack/test/timesync.mak
@@ -1,26 +1,28 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_TIMESYNC -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_TIMESYNC
 
-SRCS = bacapp.c \
-       bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bactext.c \
-       bigend.c \
-       indtext.c \
-       timesync.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/bacerror.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/timesync.c \
+	ctest.c
 
 TARGET = timesync
 
 all: ${TARGET}
+ 
+OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS}
diff --git a/bacnet-stack/test/tsm.mak b/bacnet-stack/test/tsm.mak
index 7599c906..33222d39 100644
--- a/bacnet-stack/test/tsm.mak
+++ b/bacnet-stack/test/tsm.mak
@@ -1,43 +1,46 @@
 #Makefile to build test case
 CC      = gcc
-# -g for debugging with gdb
-DEFINES = -DTSM_ENABLED=1 -DTEST -DTEST_TSM -DBIG_ENDIAN=0 -DBACDL_TEST=1
-INCLUDES = -I. -Idemo/object -Idemo/handler -Itest -Iports/linux
+SRC_DIR = ../src
+DEMO_OBJECT_DIR = ../demo/object
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DBACDL_TEST -DTEST_TSM
+
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = address.c \
-       bacaddr.c \
-       bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       demo/object/device.c \
-       demo/object/ai.c \
-       demo/object/ao.c \
-       demo/object/av.c \
-       demo/object/bi.c \
-       demo/object/bo.c \
-       demo/object/bv.c \
-       demo/object/lsp.c \
-       demo/object/mso.c \
-       demo/object/lc.c \
-       iam.c \
-       dcc.c \
-       npdu.c \
-       apdu.c \
-       tsm.c \
-       version.c \
-       test/ctest.c
-
-OBJS = ${SRCS:.c=.o}
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/bacerror.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacaddr.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/iam.c \
+	$(SRC_DIR)/dcc.c \
+	$(SRC_DIR)/npdu.c \
+	$(SRC_DIR)/apdu.c \
+	$(SRC_DIR)/version.c \
+	$(SRC_DIR)/tsm.c \
+	$(DEMO_OBJECT_DIR)/device.c \
+	$(DEMO_OBJECT_DIR)/ai.c \
+	$(DEMO_OBJECT_DIR)/ao.c \
+	$(DEMO_OBJECT_DIR)/av.c \
+	$(DEMO_OBJECT_DIR)/bi.c \
+	$(DEMO_OBJECT_DIR)/bo.c \
+	$(DEMO_OBJECT_DIR)/bv.c \
+	$(DEMO_OBJECT_DIR)/lsp.c \
+	$(DEMO_OBJECT_DIR)/mso.c \
+	$(DEMO_OBJECT_DIR)/lc.c \
+	ctest.c
 
 TARGET = tsm
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
diff --git a/bacnet-stack/test/whohas.mak b/bacnet-stack/test/whohas.mak
index 94fdc40a..ae901682 100644
--- a/bacnet-stack/test/whohas.mak
+++ b/bacnet-stack/test/whohas.mak
@@ -1,23 +1,23 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_WHOHAS -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_WHOHAS
 
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bigend.c \
-       whohas.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/whohas.c \
+	ctest.c
 
 TARGET = whohas
 
 all: ${TARGET}
+ 
+OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS}
diff --git a/bacnet-stack/test/whois.mak b/bacnet-stack/test/whois.mak
index 1da22991..54d0e88f 100644
--- a/bacnet-stack/test/whois.mak
+++ b/bacnet-stack/test/whois.mak
@@ -1,24 +1,24 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_WHOIS -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_WHOIS
 
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bigend.c \
-       whois.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/whois.c \
+	ctest.c
 
 TARGET = whois
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
diff --git a/bacnet-stack/test/wp.mak b/bacnet-stack/test/wp.mak
index 83d479a5..e3ace2f2 100644
--- a/bacnet-stack/test/wp.mak
+++ b/bacnet-stack/test/wp.mak
@@ -1,27 +1,28 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-# -g for debugging with gdb
-DEFINES = -DBACFILE=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DTEST -DTEST_WRITE_PROPERTY 
-INCLUDES = -I. -Idemo/object -Itest 
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_WRITE_PROPERTY
+
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       wp.c \
-       test/ctest.c
-
-OBJS = ${SRCS:.c=.o}
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(SRC_DIR)/wp.c \
+	ctest.c
 
 TARGET = writeproperty
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS}