diff --git a/bacnet-stack/test/bacdcode.mak b/bacnet-stack/test/bacdcode.mak
index 179853bb..22139aba 100644
--- a/bacnet-stack/test/bacdcode.mak
+++ b/bacnet-stack/test/bacdcode.mak
@@ -1,15 +1,18 @@
 #Makefile to build unit tests
 CC      = gcc
-BASEDIR = .
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DECODE
-CFLAGS = -Wall -Iinclude -Itest -g $(DEFINES)
+
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 TARGET = bacdcode
 
-SRCS = src/bacdcode.c \
-       src/bacint.c \
-       src/bacstr.c \
-       test/ctest.c
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	ctest.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/test/bacerror.mak b/bacnet-stack/test/bacerror.mak
index fa96378c..d0c5357f 100644
--- a/bacnet-stack/test/bacerror.mak
+++ b/bacnet-stack/test/bacerror.mak
@@ -1,17 +1,17 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACERROR 
-CFLAGS  = -Wall -Iinclude -Itest -g $(DEFINES)
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACERROR
 
-SRCS = src/bacdcode.c \
-       src/bacint.c \
-       src/bacstr.c \
-       src/bacerror.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
+
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/bacerror.c \
+	ctest.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/test/bacint.mak b/bacnet-stack/test/bacint.mak
index b9247fa4..47e8222a 100644
--- a/bacnet-stack/test/bacint.mak
+++ b/bacnet-stack/test/bacint.mak
@@ -1,14 +1,16 @@
 #Makefile to build unit tests
 CC      = gcc
-BASEDIR = .
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACINT
-CFLAGS  = -Wall -Iinclude -Itest -g $(DEFINES)
+
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 TARGET = bacint
 
-SRCS = src/bacint.c \
-       src/bacstr.c \
-       test/ctest.c
+SRCS = $(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	ctest.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/test/bacstr.mak b/bacnet-stack/test/bacstr.mak
index 24d82957..a0ea8ab5 100644
--- a/bacnet-stack/test/bacstr.mak
+++ b/bacnet-stack/test/bacstr.mak
@@ -1,12 +1,15 @@
 #Makefile to build unit tests
 CC      = gcc
-BASEDIR = .
-CFLAGS  = -Wall -I. -Itest -g -DTEST -DTEST_BACSTR
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACSTR
+
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 TARGET = bacstr
 
-SRCS = bacstr.c \
-       test/ctest.c
+SRCS = $(SRC_DIR)/bacstr.c \
+	ctest.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/test/bvlc.mak b/bacnet-stack/test/bvlc.mak
index bb9f0d6e..14b1869b 100644
--- a/bacnet-stack/test/bvlc.mak
+++ b/bacnet-stack/test/bvlc.mak
@@ -1,19 +1,17 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I. -I../ports/linux
 DEFINES = -DBACDL_BIP -DBIG_ENDIAN=0 -DTEST -DTEST_BVLC
-INCLUDES = -Iports/linux -Itest -I.
-CFLAGS  = -Wall $(INCLUDES)  $(DEFINES) -g
 
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bigend.c \
-       bvlc.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
+
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/bvlc.c \
+	ctest.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/test/cov.mak b/bacnet-stack/test/cov.mak
index 05ca0602..0a9a3e78 100644
--- a/bacnet-stack/test/cov.mak
+++ b/bacnet-stack/test/cov.mak
@@ -1,20 +1,21 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -Idemo/object -DTEST -DTEST_COV -DBACDL_TEST=1 -DBIG_ENDIAN=0 -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I. -I../demo/object 
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_COV -DBACDL_TEST=1 -DBACAPP_ALL
 
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       bacapp.c \
-       indtext.c \
-       bactext.c \
-       cov.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
+
+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)/indtext.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/cov.c \
+	ctest.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/test/crc.mak b/bacnet-stack/test/crc.mak
index 545511aa..c2c113f7 100644
--- a/bacnet-stack/test/crc.mak
+++ b/bacnet-stack/test/crc.mak
@@ -1,13 +1,15 @@
 #Makefile to build CRC tests
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_CRC -g
-#CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_CRC -DCRC_USE_TABLE -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I. -I../demo/object 
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_CRC
 
-OBJS    = crc.o test/ctest.o
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
+
+SRCS = $(SRC_DIR)/crc.c \
+	ctest.c
+
+OBJS = ${SRCS:.c=.o}
 
 TARGET = crc