consolidate tests, give small-cor explicit handle name