Organizing container tests