Validation script update

* Modify scripts to reflect new structure and default scenario