Improved Makefile, tests.