Adds test live functionality back into content controller
Merge branch 'fix/test-live' into develop

* fix/test-live:
  Adds test live functionality back into content controller