Add FactoryGirl
Remove unused functionality
Fix broken specs and add missing ones