Expand test cases
Fix test cases
Expand `TestEffects` test cases