Fix tests
Fix Makefile