Add factorygirl config to spec_helper file
Refactored all tests to follow simplicity