Various changes to tests and Makefile.