Some more progresss on Cascading

It's just to facilitate development, having only one active test at a time, since running all of them takes forever.