I've resolved issues with the failing rspec tests