Revert "Fix effect tests. They broke after some control and behavior changes."

I accidentally committed a bunch of local changes.

This reverts commit 9e8575bd3fff1c9427d5f189683c3b57adc2ec0d.