Upgraded Rspec 2.x to 3.x