Integrate previewer and fix broken tests

[CONNPOL-147](https://jira.dev.bbc.co.uk/secure/RapidBoard.jspa?rapidView=1292&view=detail&selectedIssue=CONNPOL-147)