Added test cases and removed dead code

No match.