Move resque stub into test support
Wrap some assertions in ts_retry
Some cleanup, and add missing sphinx_spec
Cleanup