update some tests and Makefile