Rspec3 and fix broken tests