Refactoring for test case passing and add test cases

Explanation of why on google group. All test cases passing.