Refactored makefile just so that all tests compile and run again without errors.
Though the makefile should still be optimized!!