Some modifications to make archetype testing work.