Type name is embedded with each snapshot item.
Fixed tests.
Consolidated preparation of test snapshot.