use sidekiq/testing rather than inserting into redis on test
Merge branch 'master' into timeline-rebase