Test Driver half done
edit and mark in test driver
removed unused unit test class
Merge remote-tracking branch 'origin/khye_an'