added test directory; improved makefile procedure