Sample and test scripts were updated