Silly discussion test fixes
Merge branch 'master' of https://github.com/guardian/frontend