Fixing test compilation in makefile and fixing some issues
Merge remote-tracking branch 'origin/master'