Modified test scripts