RSpec 3 readiness
Changed specs to respect RSpec 3 future deprecations (This removed a lot of noise from deprecated warnings)