Fix Makefile to have test-dir