Correct ids and added a test
Moved Archetypes to 7.1.3.CR1, Removed AS 7.0.X, Implemented Archetypes tests (generate and build)