Fix smoke test

All individual smoketest test scripts are troubleshot, updated and tested pass.