Test Case fixed, small edge case added