Refactor so we can have non-live-streaming testers