Fix rspec tests and merge conflicts

Tests now run again