Adding Testcases for #7