Rspec 3.0 fixes

 - All rspec 3.0 deprecation warnings solved.