Add more test-cases