Optimize and clean up code in program.cs and TestCaseDriver.cs
Finished REQ9435_TST1114
Merge branch 'develop'