[PD-dev] unittests and template Makefile merging