Updated some of the test scripts