Don't extend Sidekiq namespace
Rearrange a few things and add more tests