Updated test scripts to allow executing smaller numbers of tests