Changed all specs to utilize factory girl factories