Add Test cases.
All test case passed
Optimized loval var.
Add Test Case
All test passed.
Merge branch 'develop'