Updated some test scripts