series and team nesting and various test changes