Added Specs and Factories