Installed Factory Girl and refactored