A few test script updates