Fix test-cases