Fix Makefile.
Fix tests.