More tweaks; added a 'make test' command.