Fix test script
Temporary Makefile changes
Compilation fixes