M: Added more test-cases.