diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb
index 7aa0ff46cde088b28edb1e616ec674e778ed6fbf..ad77f7f69b19ea3c1994adae0bccb8abfba0a974 100644
--- a/lib/gitlab/import_export/project_tree_restorer.rb
+++ b/lib/gitlab/import_export/project_tree_restorer.rb
@@ -14,7 +14,8 @@ module Gitlab
         @tree_hash = ActiveSupport::JSON.decode(json)
         @project_members = @tree_hash.delete('project_members')
         create_relations
-      rescue
+      rescue => e
+        # TODO: handle errors better, move them to a shared thing
         false
       end
 
@@ -83,7 +84,7 @@ module Gitlab
 
       def relation_from_factory(relation, relation_hash)
         Gitlab::ImportExport::RelationFactory.create(
-          relation_sym: relation, relation_hash: relation_hash.merge('project_id' => project.id), members_map: members_map)
+          relation_sym: relation.to_sym, relation_hash: relation_hash.merge('project_id' => project.id), members_map: members_map)
       end
     end
   end
diff --git a/spec/lib/gitlab/import_export/members_mapper_spec.rb b/spec/lib/gitlab/import_export/members_mapper_spec.rb
index 9175356c641a1ae0fc9892ae3a1935f39128cf40..a4d3d6d122f69f5adbc51402ea5e32fda38b9379 100644
--- a/spec/lib/gitlab/import_export/members_mapper_spec.rb
+++ b/spec/lib/gitlab/import_export/members_mapper_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::ImportExport::MembersMapper, services: true do
-  describe :map do
+  describe 'map members' do
 
     let(:user) { create(:user) }
     let(:project) { create(:project, :public, name: 'searchable_project') }
@@ -31,7 +31,7 @@ describe Gitlab::ImportExport::MembersMapper, services: true do
     end
 
     let(:members_mapper) do
-      Gitlab::ImportExport::MembersMapper.new(
+      described_class.new(
         exported_members: exported_members, user: user, project_id: project.id)
     end
 
diff --git a/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json
similarity index 100%
rename from lib/gitlab/import_export/project.json
rename to spec/lib/gitlab/import_export/project.json
diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
index aa8a12c4caaf3136ef554810885d413a1f47ff17..0958365ff9e1f10f968336a0fe33a2d9c00303e0 100644
--- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
-  describe :restore do
+  describe 'restore project tree' do
 
     let(:user) { create(:user) }
     let(:namespace) { create(:namespace, owner: user) }
-    let(:project_tree_restorer) { Gitlab::ImportExport::ProjectTreeRestorer.new(path: "lib/gitlab/import_export/", user: user, project_path: 'project', namespace_id: namespace.id) }
+    let(:project_tree_restorer) { described_class.new(path: Rails.root.join("spec/lib/gitlab/import_export/"), user: user, project_path: 'project', namespace_id: namespace.id) }
 
     context 'JSON' do
       let(:restored_project_json) do