Adding concrete specs that used to live in core.  Improving factories to reflect needs