Makefile, tests update