Add more testcases
New approach - structural-only matching