Clean up with rspec 3.0
Converted by transpec