Updating Makefile and test coverage.