Updated makefile and tests.