added factories, and more spec_helper setup