Repair test scripts. Update Makefile and package.json.