diff --git a/Makefile b/Makefile
index 55f4803..96798fd 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-export CC=gcc
-export CFLAGS=-Wall -ansi
-export TOP=$(shell pwd)
-export INCLUDEDIR=$(TOP)/include
-export INCLUDES=-I$(INCLUDEDIR)
+export CC = gcc
+export CFLAGS = -Wall -ansi -DNDEBUG
+export TOP = $(shell pwd)
+export INCLUDEDIR = $(TOP)/include
+export INCLUDES = -I$(INCLUDEDIR)
 
 SUBDIRS=common crypto utils tests
 
diff --git a/common/Makefile b/common/Makefile
index 51d482e..fc73ec2 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-SRCS=utility_stub.c
-OBJS=$(SRCS:.c=.o)
+SRCS = utility_stub.c
+OBJS = $(SRCS:.c=.o)
 
 all:	libcommon.a
 
diff --git a/crypto/Makefile b/crypto/Makefile
index b6d654f..92b2689 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -2,18 +2,18 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-SRCS=rsa.c sha1.c sha2.c padding.c rsa_utility.c sha_utility.c
-OBJS=$(SRCS:.c=.o)
+SRCS = rsa.c sha1.c sha2.c padding.c rsa_utility.c sha_utility.c
+OBJS = $(SRCS:.c=.o)
 
-all:	libcrypto.a
+all: libcrypto.a
 
-libcrypto.a:	$(OBJS)
+libcrypto.a: $(OBJS)
 	ar rs libcrypto.a $(OBJS)
 
-padding.c:	genpadding.sh
+padding.c: genpadding.sh
 	./genpadding.sh >$@
 
-.c.o:	$(OBJS)
+.c.o: $(OBJS)
 	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 clean: 
diff --git a/tests/Makefile b/tests/Makefile
index 4801dc5..5d4faf9 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 CC ?= gcc
-CFLAGS = -Wall
+CFLAGS = -Wall -DNDEBUG
 INCLUDES ?= -I../include/
 TOP ?= ../
 
@@ -19,7 +19,7 @@
 	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
 
 sha_benchmark:	sha_benchmark.c timer_utils.c
-	$(CC) $(CFLAGS) -DNDEBUG $(INCLUDES) $^ -o $@ $(LIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(LIBS)
 
 clean:
 	rm -f sha_tests sha_benchmark firmware_image_tests
diff --git a/tests/run_rsa_tests.sh b/tests/run_rsa_tests.sh
index d56f5a0..2038483 100755
--- a/tests/run_rsa_tests.sh
+++ b/tests/run_rsa_tests.sh
@@ -72,7 +72,7 @@
 }
 
 function cleanup {
-  rm ${TEST_FILE} ${TEST_FILE}.*.sig
+  rm ${SCRIPT_DIR}/${TEST_FILE} ${SCRIPT_DIR}/${TEST_FILE}.*.sig
 }
 
 # Determine script directory.
@@ -87,6 +87,7 @@
 fi
 UTIL_DIR=`dirname ${SCRIPT_DIR}`/utils
 KEY_DIR=${SCRIPT_DIR}/testkeys
+TEST_DIR=${SCRIPT_DIR}/
 
 echo "Generating test cases..."
 pre_work
@@ -101,7 +102,7 @@
 
 echo
 echo "Cleaning up..."
-#cleanup
+cleanup
 
 exit $return_code
 
diff --git a/utils/Makefile b/utils/Makefile
index b13bc65..c1967fc 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -3,33 +3,33 @@
 # found in the LICENSE file.
 
 CC ?= gcc
-CFLAGS=-Wall -ggdb
+CFLAGS = -Wall -ggdb -DNDEBUG
 INCLUDES ?= -I../include/
 TOP ?= ../
 
+LIBS = -lcrypto
+FIRMWARELIBS = $(TOP)/crypto/libcrypto.a $(TOP)/common/libcommon.a
 
-LIBS=-lcrypto
-FIRMWARELIBS=$(TOP)/crypto/libcrypto.a $(TOP)/common/libcommon.a
+all: dumpRSAPublicKey verify_data signature_digest firmware_utility
 
-all:	dumpRSAPublicKey verify_data signature_digest firmware_utility
+dumpRSAPublicKey: dumpRSAPublicKey.c
+	$(CC) $(CFLAGS) $(LIBS) $< -o $@
 
-dumpRSAPublicKey:	dumpRSAPublicKey.c
-		$(CC) $(CFLAGS) $(LIBS) $< -o $@
+verify_data: verify_data.c file_keys.o
+	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ file_keys.o $(FIRMWARELIBS)
 
-verify_data:	verify_data.c file_keys.o
-	$(CC) $(CFLAGS) -DNDEBUG $(INCLUDES) $< -o $@ file_keys.o $(FIRMWARELIBS) 
+signature_digest: signature_digest.c
+	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(FIRMWARELIBS)
 
-signature_digest:	signature_digest.c
-	$(CC) $(CFLAGS) -DNDEBUG $(INCLUDES) $< -o $@ $(FIRMWARELIBS)
+firmware_utility: firmware_utility.c firmware_image.o file_keys.o
+	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@  firmware_image.o $(FIRMWARELIBS)
 
-firmware_utility:	firmware_utility.c firmware_image.o file_keys.o
-	$(CC) $(CFLAGS) -DNDEBUG $(INCLUDES) $< -o $@  firmware_image.o $(FIRMWARELIBS)
+file_keys.o: file_keys.c
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-file_keys.o:	file_keys.c
-		$(CC) $(CFLAGS) -DNDEBUG $(INCLUDES) -c $< -o $@
+firmware_image.o: firmware_image.c
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-firmware_image.o:	firmware_image.c
-		$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 clean:
 	rm -f dumpRSAPublicKey verify_data signature_digest firmware_image.o file_keys.o