Fix makefile and some test data