new test code
changed Makefile stuff