Improve test makefile