Fix makefile and test run