Renamed, converted to parametric archetype and added one test