Mild refactor of TeamTests