Updating RSpec to 3.0, syntax changes
Final pass fixing rspec deprecations