Test archetypes updates for new id-codes (intermediate version).
2013-12-09 cut of archetypes.
Fix up various test archetypes based on recent id / code changes.