Adjust test script to give more debug info