[Reviewed] Fix grade <-> team association.

Closes #289.