Added more test-cases.