switch from mock objects to factory girl
Change org specs to work