Add tests demonstrating teams issue.
Reverts team assignment change.

Until the teams tests are passing its better to be broken in the
same old way instead of a new one.