Improve Makefile
Improve test