Fixing tests
Merge remote-tracking branch 'origin/feature/CFD-156-Quick_post_collapse' into feature/CFD-156-Quick_post_update_activity_stream