Add tests and support for multiple fieldsets that are not 'Archetypes'