Test-cases expanded