Simplify Badge Slot Test
Fix Bad Advertisement Feature Logic

Oops! A copy-and-paste mishap.
Remove Bad Formatting
Rename Test DFP Data

It's not really default data; it's specifically for testing.
Merge branch 'master' into kc-badge-slot-test

Conflicts:
	article/test/ArticleFeatureTest.scala
Merge pull request #4312 from guardian/kc-badge-slot-test

Fix Bad Advertisement Feature Logic