Fix effects tests that broke after some control and behavior changes.