fixing test/makefile to use our tests rather than zahorjan's