Updated test script and makefile