DC2B-34 Fix test cases
1) Fix existing test cases.
2) provides more unit test cases for modification