Update specs to rspec 3 syntax
in-place refactor inlining conditionals