Finish the team resolver and add test coverage for it.