It improve the unit testing. And modify the Makefile.