Add test
Update Makefile
some fix