More reorganizing of test infrastructure for generalization