Demo changes.

Summary: Changes for demo.

Test Plan: run unit tests

Reviewers: #nitro, gosdel01

Reviewed By: #nitro, gosdel01

Subscribers: gosdel01

Differential Revision: http://pc-s057811.national.core.bbc.co.uk:8080/D239