Perhaps it's quite late now, but here is a small suggestion:

We could retain all the existing test-types and create new ones with pluralized names.


(After all, the newly created test-types actually contain more than one members so a better name would be *TypeWithEvents*, *TypeWithFields*, etc - pluralized.)