Updated test scripts