diff --git a/test/abort.mak b/test/abort.mak
index 3925bc1d..ab0c4e7c 100644
--- a/test/abort.mak
+++ b/test/abort.mak
@@ -13,23 +13,29 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/abort.c \
 	ctest.c
 
-TARGET = abort
+TARGET_NAME = abort
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
-	rm -rf ${TARGET} $(OBJS) 
+	rm -rf ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/test/address.mak b/test/address.mak
index 7dfe0b50..eb4a0cb6 100644
--- a/test/address.mak
+++ b/test/address.mak
@@ -22,7 +22,13 @@ SRCS = $(SRC_DIR)/bacnet/basic/binding/address.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = address
+TARGET_NAME = address
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
@@ -39,4 +45,7 @@ depend:
 clean:
 	rm -rf ${TARGET} $(OBJS)
 
+test:
+	./${TARGET}
+
 include: .depend
diff --git a/test/arf.mak b/test/arf.mak
index d60de0f3..cddf9264 100644
--- a/test/arf.mak
+++ b/test/arf.mak
@@ -15,7 +15,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = arf
+TARGET_NAME = arf
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/awf.mak b/test/awf.mak
index 0acb1dc8..8fe5a0b0 100644
--- a/test/awf.mak
+++ b/test/awf.mak
@@ -15,20 +15,26 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = awf
+TARGET_NAME = awf
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf ${TARGET} $(OBJS)
 
diff --git a/test/bacapp.mak b/test/bacapp.mak
index be9a45db..15d47718 100644
--- a/test/bacapp.mak
+++ b/test/bacapp.mak
@@ -20,7 +20,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = bacapp
+TARGET_NAME = bacapp
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/bacdcode.mak b/test/bacdcode.mak
index 76d7fb76..bf63e8e3 100644
--- a/test/bacdcode.mak
+++ b/test/bacdcode.mak
@@ -6,7 +6,13 @@ DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DECODE -DMAX_APDU=50
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-TARGET = bacdcode
+TARGET_NAME = bacdcode
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/bacint.c \
diff --git a/test/bacdevobjpropref.mak b/test/bacdevobjpropref.mak
index ebcf8465..eeb35d61 100644
--- a/test/bacdevobjpropref.mak
+++ b/test/bacdevobjpropref.mak
@@ -20,7 +20,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = bacdevobjpropref
+TARGET_NAME = bacdevobjpropref
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/bacerror.mak b/test/bacerror.mak
index 300933f0..e049bef6 100644
--- a/test/bacerror.mak
+++ b/test/bacerror.mak
@@ -15,21 +15,27 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = bacerror
+TARGET_NAME = bacerror
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
-	rm -rf ${TARGET} $(OBJS) 
+	rm -rf ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/test/bacint.mak b/test/bacint.mak
index 6d3c8943..7830cf7b 100644
--- a/test/bacint.mak
+++ b/test/bacint.mak
@@ -6,7 +6,13 @@ DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACINT
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-TARGET = bacint
+TARGET_NAME = bacint
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 SRCS = $(SRC_DIR)/bacnet/bacint.c \
 	$(SRC_DIR)/bacnet/bacstr.c \
@@ -15,18 +21,18 @@ SRCS = $(SRC_DIR)/bacnet/bacint.c \
 OBJS = ${SRCS:.c=.o}
 
 all: ${TARGET}
- 
+
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
-	rm -rf ${OBJS} ${TARGET} 
+	rm -rf ${OBJS} ${TARGET}
 
 include: .depend
diff --git a/test/bacstr.mak b/test/bacstr.mak
index 31d53abe..fd8b96d9 100644
--- a/test/bacstr.mak
+++ b/test/bacstr.mak
@@ -6,7 +6,13 @@ DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACSTR
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-TARGET = bacstr
+TARGET_NAME = bacstr
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 SRCS = $(SRC_DIR)/bacnet/bacstr.c \
 	ctest.c
@@ -14,17 +20,17 @@ SRCS = $(SRC_DIR)/bacnet/bacstr.c \
 OBJS = ${SRCS:.c=.o}
 
 all: ${TARGET}
- 
+
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${OBJS} ${TARGET} *.bak
 
diff --git a/test/bbmd6.mak b/test/bbmd6.mak
index 47a5ca74..f63b194d 100644
--- a/test/bbmd6.mak
+++ b/test/bbmd6.mak
@@ -20,7 +20,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(DEMO_DIR)/h_bbmd6.c \
 	ctest.c
 
-TARGET = bbmd6
+TARGET_NAME = bbmd6
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/bvlc.mak b/test/bvlc.mak
index 6290c39f..31a858ea 100644
--- a/test/bvlc.mak
+++ b/test/bvlc.mak
@@ -15,20 +15,26 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = bvlc
+TARGET_NAME = bvlc
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/bvlc6.mak b/test/bvlc6.mak
index ef7b8807..d5f5e6bc 100644
--- a/test/bvlc6.mak
+++ b/test/bvlc6.mak
@@ -13,7 +13,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/datalink/bvlc6.c \
 	ctest.c
 
-TARGET = bvlc6
+TARGET_NAME = bvlc6
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/cov.mak b/test/cov.mak
index 20a06c2b..fc5314b2 100644
--- a/test/cov.mak
+++ b/test/cov.mak
@@ -22,7 +22,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = cov
+TARGET_NAME = cov
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/crc.mak b/test/crc.mak
index 93e46b25..96b0e889 100644
--- a/test/crc.mak
+++ b/test/crc.mak
@@ -1,7 +1,7 @@
 #Makefile to build CRC tests
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I$(SRC_DIR) -I. -I../demo/object 
+INCLUDES = -I$(SRC_DIR) -I. -I../demo/object
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_CRC
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
@@ -11,20 +11,26 @@ SRCS = $(SRC_DIR)/bacnet/datalink/crc.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = crc
+TARGET_NAME = crc
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/datetime.mak b/test/datetime.mak
index d77729c4..3b593eb3 100644
--- a/test/datetime.mak
+++ b/test/datetime.mak
@@ -20,7 +20,13 @@ SRCS = $(SRC_DIR)/bacnet/datetime.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = datetime
+TARGET_NAME = datetime
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/dcc.mak b/test/dcc.mak
index 4b85ad21..1a8e15f0 100644
--- a/test/dcc.mak
+++ b/test/dcc.mak
@@ -13,22 +13,28 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/dcc.c \
 	ctest.c
 
-TARGET = dcc
+TARGET_NAME = dcc
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/event.mak b/test/event.mak
index e5888c45..c2781911 100644
--- a/test/event.mak
+++ b/test/event.mak
@@ -23,7 +23,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/event.c \
 	ctest.c
 
-TARGET = event
+TARGET_NAME = event
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/fifo.mak b/test/fifo.mak
index 2be9b52e..18838d9e 100644
--- a/test/fifo.mak
+++ b/test/fifo.mak
@@ -9,22 +9,28 @@ CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 SRCS = $(SRC_DIR)/bacnet/basic/sys/fifo.c \
 	ctest.c
 
-TARGET = fifo
+TARGET_NAME = fifo
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/filename.mak b/test/filename.mak
index 8a040c4e..600dfb4b 100644
--- a/test/filename.mak
+++ b/test/filename.mak
@@ -11,20 +11,26 @@ SRCS = $(SRC_DIR)/bacnet/basic/sys/filename.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = filename
+TARGET_NAME = filename
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-  
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-  
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/getevent.mak b/test/getevent.mak
index e1b9e97f..8c1f482d 100644
--- a/test/getevent.mak
+++ b/test/getevent.mak
@@ -20,7 +20,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/getevent.c \
 	ctest.c
 
-TARGET = getevent
+TARGET_NAME = getevent
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/iam.mak b/test/iam.mak
index 56a09fa1..67fc5fd0 100755
--- a/test/iam.mak
+++ b/test/iam.mak
@@ -15,20 +15,26 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = iam
+TARGET_NAME = iam
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/ihave.mak b/test/ihave.mak
index 5128585a..8e43d99c 100644
--- a/test/ihave.mak
+++ b/test/ihave.mak
@@ -15,7 +15,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = ihave
+TARGET_NAME = ihave
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/indtext.mak b/test/indtext.mak
index bd69cf95..918f3474 100644
--- a/test/indtext.mak
+++ b/test/indtext.mak
@@ -11,20 +11,26 @@ SRCS = $(SRC_DIR)/bacnet/indtext.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = indtext
+TARGET_NAME = indtext
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${OBJS} ${TARGET} *.bak
 
diff --git a/test/key.mak b/test/key.mak
index 997d67f6..d86cea2e 100644
--- a/test/key.mak
+++ b/test/key.mak
@@ -9,14 +9,20 @@ CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 SRCS = $(SRC_DIR)/bacnet/basic/sys/key.c \
 	ctest.c
 
-TARGET = key 
+TARGET_NAME = key
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 OBJS  = ${SRCS:.c=.o}
 
 all: ${TARGET}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
diff --git a/test/keylist.mak b/test/keylist.mak
index 8fddc71f..0aea209b 100644
--- a/test/keylist.mak
+++ b/test/keylist.mak
@@ -9,14 +9,20 @@ CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 SRCS = $(SRC_DIR)/bacnet/basic/sys/keylist.c \
 	ctest.c
 
-TARGET = keylist 
+TARGET_NAME = keylist
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 OBJS  = ${SRCS:.c=.o}
 
 all: ${TARGET}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
diff --git a/test/lighting.mak b/test/lighting.mak
index d50a54a6..c5bd2850 100644
--- a/test/lighting.mak
+++ b/test/lighting.mak
@@ -13,7 +13,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/lighting.c \
 	ctest.c
 
-TARGET = lighting
+TARGET_NAME = lighting
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/lso.mak b/test/lso.mak
index 1ef4d939..85ff91e6 100644
--- a/test/lso.mak
+++ b/test/lso.mak
@@ -21,7 +21,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/lso.c \
 	ctest.c
 
-TARGET = lso
+TARGET_NAME = lso
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/memcopy.mak b/test/memcopy.mak
index 741e5a4a..03304e88 100644
--- a/test/memcopy.mak
+++ b/test/memcopy.mak
@@ -9,7 +9,13 @@ CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 SRCS = $(SRC_DIR)/bacnet/memcopy.c \
 	ctest.c
 
-TARGET = memcopy
+TARGET_NAME = memcopy
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/mstp.mak b/test/mstp.mak
index 86caf4ee..5e8f8d51 100644
--- a/test/mstp.mak
+++ b/test/mstp.mak
@@ -13,7 +13,13 @@ SRCS = $(SRC_DIR)/bacnet/datalink/mstp.c \
 	$(SRC_DIR)/bacnet/basic/sys/ringbuf.c \
 	ctest.c
 
-TARGET = mstp
+TARGET_NAME = mstp
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/npdu.mak b/test/npdu.mak
index 19bcfb9f..2cc90b5c 100644
--- a/test/npdu.mak
+++ b/test/npdu.mak
@@ -15,22 +15,28 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/dcc.c \
 	ctest.c
 
-TARGET = npdu
+TARGET_NAME = npdu
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/objects.cbp b/test/objects.cbp
index ce7fa0ec..dc2a2be9 100644
--- a/test/objects.cbp
+++ b/test/objects.cbp
@@ -7,35 +7,31 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Release">
-				<Option output="bin\Release\objects" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+				<Option output="bin/Release/objects" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
-					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-Og" />
+					<Add option="-g" />
 					<Add option="-DTEST" />
 					<Add option="-DTEST_OBJECT_LIST" />
-					<Add directory="..\include" />
-					<Add directory="." />
+					<Add directory="../src" />
+					<Add directory="../test" />
 				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
 			</Target>
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
-		<Unit filename="..\include\key.h" />
-		<Unit filename="..\include\keylist.h" />
-		<Unit filename="..\include\objects.h" />
-		<Unit filename="..\src\key.c">
+		<Unit filename="../src/bacnet/basic/object/objects.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\keylist.c">
+		<Unit filename="../src/bacnet/basic/sys/key.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\objects.c">
+		<Unit filename="../src/bacnet/basic/sys/keylist.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="ctest.c">
diff --git a/test/objects.mak b/test/objects.mak
index ae10fc8e..cfaf4d1d 100644
--- a/test/objects.mak
+++ b/test/objects.mak
@@ -6,29 +6,38 @@ DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_OBJECT_LIST
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacnet/objects.c \
+SRCS = $(SRC_DIR)/bacnet/basic/object/objects.c \
 	$(SRC_DIR)/bacnet/basic/sys/keylist.c \
 	$(SRC_DIR)/bacnet/basic/sys/key.c \
 	ctest.c
 
-TARGET = rp
+TARGET_NAME = objects
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
+test:
+	./${TARGET}
+
 include: .depend
 
diff --git a/test/proplist.mak b/test/proplist.mak
index 57c4f504..6f095771 100644
--- a/test/proplist.mak
+++ b/test/proplist.mak
@@ -17,7 +17,13 @@ SRCS = $(SRC_DIR)/bacnet/proplist.c \
 	$(SRC_DIR)/bacnet/lighting.c \
 	ctest.c
 
-TARGET = proplist
+TARGET_NAME = proplist
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 OBJS  = ${SRCS:.c=.o}
 
diff --git a/test/ptransfer.mak b/test/ptransfer.mak
index 62fbee2e..aa53da27 100644
--- a/test/ptransfer.mak
+++ b/test/ptransfer.mak
@@ -19,7 +19,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/ptransfer.c \
 	ctest.c
 
-TARGET = ptransfer
+TARGET_NAME = ptransfer
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/rd.mak b/test/rd.mak
index 766f3366..2c544dd7 100644
--- a/test/rd.mak
+++ b/test/rd.mak
@@ -13,22 +13,28 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/rd.c \
 	ctest.c
 
-TARGET = rd
+TARGET_NAME = rd
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/reject.mak b/test/reject.mak
index 323e8e61..27c75ad5 100644
--- a/test/reject.mak
+++ b/test/reject.mak
@@ -13,22 +13,28 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/reject.c \
 	ctest.c
 
-TARGET = reject
+TARGET_NAME = reject
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/ringbuf.mak b/test/ringbuf.mak
index b17db08e..cebd5fc3 100644
--- a/test/ringbuf.mak
+++ b/test/ringbuf.mak
@@ -9,22 +9,28 @@ CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 SRCS = $(SRC_DIR)/bacnet/basic/sys/ringbuf.c \
 	ctest.c
 
-TARGET = ringbuf
+TARGET_NAME = ringbuf
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/rp.mak b/test/rp.mak
index 7b721c51..af0f69bb 100644
--- a/test/rp.mak
+++ b/test/rp.mak
@@ -13,22 +13,28 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/rp.c \
 	ctest.c
 
-TARGET = rp
+TARGET_NAME = rp
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/rpm.mak b/test/rpm.mak
index d94b9d06..baf8c1d4 100644
--- a/test/rpm.mak
+++ b/test/rpm.mak
@@ -21,7 +21,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/rpm.c \
 	ctest.c
 
-TARGET = rpm
+TARGET_NAME = rpm
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/sbuf.mak b/test/sbuf.mak
index be339ceb..b4c9f0ea 100644
--- a/test/sbuf.mak
+++ b/test/sbuf.mak
@@ -9,22 +9,28 @@ CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 SRCS = $(SRC_DIR)/bacnet/basic/sys/sbuf.c \
 	ctest.c
 
-TARGET = sbuf
+TARGET_NAME = sbuf
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-  
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-  
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/timer.mak b/test/timer.mak
index 1358d3c9..79773208 100644
--- a/test/timer.mak
+++ b/test/timer.mak
@@ -9,7 +9,13 @@ CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 SRCS = $(SRC_DIR)/bacnet/timer.c \
 	ctest.c
 
-TARGET = timer
+TARGET_NAME = timer
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/timesync.mak b/test/timesync.mak
index 596df8af..3439c534 100644
--- a/test/timesync.mak
+++ b/test/timesync.mak
@@ -16,7 +16,13 @@ DEFINES := -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_TIMESYNC
 CFLAGS  := $(INCLUDES) $(DEFINES) -g
 CFLAGS += -Wall
 
-TARGET := timesync
+TARGET_NAME := timesync
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 SRCS := $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/bacint.c \
diff --git a/test/vmac.mak b/test/vmac.mak
index 6b25fbd9..f2669d76 100644
--- a/test/vmac.mak
+++ b/test/vmac.mak
@@ -10,7 +10,13 @@ SRCS = $(SRC_DIR)/bacnet/basic/sys/keylist.c \
 	$(SRC_DIR)/bacnet/basic/bbmd6/vmac.c \
 	ctest.c
 
-TARGET = vmac
+TARGET_NAME = vmac
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
 
diff --git a/test/whohas.mak b/test/whohas.mak
index b08a24b9..242e25d9 100644
--- a/test/whohas.mak
+++ b/test/whohas.mak
@@ -13,10 +13,16 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/whohas.c \
 	ctest.c
 
-TARGET = whohas
+TARGET_NAME = whohas
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
diff --git a/test/whois.mak b/test/whois.mak
index 05d69871..21870dda 100644
--- a/test/whois.mak
+++ b/test/whois.mak
@@ -13,22 +13,28 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/whois.c \
 	ctest.c
 
-TARGET = whois
+TARGET_NAME = whois
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}
- 
+
 OBJS = ${SRCS:.c=.o}
 
 ${TARGET}: ${OBJS}
-	${CC} -o $@ ${OBJS} 
+	${CC} -o $@ ${OBJS}
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
-	
+
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
-	
+
 clean:
 	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
 
diff --git a/test/wp.mak b/test/wp.mak
index 7b00c269..8ab2e1e8 100644
--- a/test/wp.mak
+++ b/test/wp.mak
@@ -19,7 +19,13 @@ SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
 	$(SRC_DIR)/bacnet/wp.c \
 	ctest.c
 
-TARGET = wp
+TARGET_NAME = wp
+ifeq ($(OS),Windows_NT)
+TARGET_EXT = .exe
+else
+TARGET_EXT =
+endif
+TARGET = $(TARGET_NAME)$(TARGET_EXT)
 
 all: ${TARGET}