Update tests to RSpec 3 style
Merge pull request #137 from shepmaster/rspec-3

Update tests to RSpec 3 style