Improved Archetype tests