Spec: Upgrade to Rspec 3 with some cleaning