Completed troubleshooting and adding any necessary functions to make smoketest run.  Smoke test suites have been tested passed before checkin.