Modification to use briefer registration.
Temporarily removing type registration.
Migrated type registration to new model.
Fixed test pages.