Version with all rspec test pass