Changed test scripts to match new makefile output.