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