update tests to rspec 3.0 format
Merge pull request #1 from pmckee11/develop

update tests to rspec 3.0 format