Redo tests, add teams