MADE:
--> Change makefile of test to new repo structure

MADE:
--> Change makefile of test to new repo structure
Merge branch 'master' into core_sockets
MADE:
--> added debug couts