Changed from old style :should to :expect based syntax

Switch to rspec 3.0 style syntax everywhere