Refactored specs

Changed specs to reflect new rspec syntax.