Do not merge, test_discussion test fixes.
Donot Merge. Discussion automation test fixes (not complete)