functional test changes
Merge branch '2.2.0' of https://github.com/phresco/archetypes into 2.2.0