Fix warning messages
Improved makefile
Fix heavy tests