[#61718846] Re-format TeamsController and Spec code