Rework jbs using rspec and more modular design.