Better test scripts, remove debug