Update Makefile and dependencies.
Update test suite.