updated tests, Makefile