Fixed up minor errors in the self-testers and the Makefile.