Merged test and layer3 directory Makefiles