Continue refactoring. Use repostory and team
Rspec fixes
Fixed protected branches and file edit