updated tests, updated Makefile