Merge "EffectsTest enhancements" into jb-mr1-dev