Update scripts to parse command line args
Update test scripts