Moved factory definitions in factories directory to factories.rb file