New code-related upgrades to test archetypes