Fix smoke tests for following stuff
Merge pull request #153 from Financial-Times/fix-smoke-tests

Fix smoke tests for following stuff