updated tests for rspec 3
merge conflicts