Updated testcases for #217
Updated cascading mechanism to fix #217