Minor updates to test archetypes