Issue #8 #16. Optimize and re-factor text test case.
Merge pull request #119 from Samsung/Issue_8

Issue #8 #16. Optimize and re-factor text test case.