Rebase unit test and excution and rework Makefile.