diff --git a/spec/lib/graphql_spec.rb b/spec/lib/graphql_spec.rb
index c0d2fbdfc..00505ac1c 100644
--- a/spec/lib/graphql_spec.rb
+++ b/spec/lib/graphql_spec.rb
@@ -7,122 +7,98 @@ describe ConsulSchema do
 
   describe "queries to single elements" do
     let(:proposal) { create(:proposal, title: 'Proposal Title') }
-    let(:query_string) { "{ proposal(id: #{proposal.id}) { id, title } }" }
 
-    it "returns fields of numeric type" do
-      returned_proposal = result['data']['proposal']
-      expect(returned_proposal['id']).to eq(proposal.id)
+    describe "can returns fields of" do
+      let(:query_string) { "{ proposal(id: #{proposal.id}) { id, title } }" }
+      subject(:returned_proposal) { result['data']['proposal'] }
+
+      it "numeric type" do
+        expect(returned_proposal['id']).to eq(proposal.id)
+      end
+
+      it "String type" do
+        expect(returned_proposal['title']).to eq(proposal.title)
+      end
     end
 
-    it "returns fields of String type" do
-      returned_proposal = result['data']['proposal']
-      expect(returned_proposal['title']).to eq('Proposal Title')
-    end
+    describe "support nested" do
+      let(:proposal_author) { create(:user) }
+      let(:comments_author) { create(:user) }
+      let(:proposal) { create(:proposal, author: proposal_author) }
+      let!(:comment_1) { create(:comment, author: comments_author, commentable: proposal) }
+      let!(:comment_2) { create(:comment, author: comments_author, commentable: proposal) }
+      let(:query_string) { "{ proposal(id: #{proposal.id}) { author { username }, comments { edges { node { body } } } } }" }
+      subject(:returned_proposal) { result['data']['proposal'] }
 
-    describe "supports nested queries" do
-      let(:user) { create(:user) }
-
-      it "with :has_one associations" do
+      it ":has_one associations" do
         skip "I think this test isn't needed"
         # TODO: the only has_one associations inside the project are in the User
         # model (administrator, valuator, etc.). But since I think this data
         # shouldn't be exposed to the API, there's no point in testing this.
-        #
-        # user = create(:user)
-        # admin = create(:administrator)
-        # user.administrator = admin
-        # query_string = "{ user(id: #{user.id}) { administrator { id } } }"
-        #
-        # result = ConsulSchema.execute(query_string, context: {}, variables: {})
-        # returned_admin = result['data']['user']['administrator']
-        #
-        # expect(returned_admin.id).to eq(admin.id)
-      end
-
-      it "with :belongs_to associations" do
-        proposal = create(:proposal, author: user)
-        query_string = "{ proposal(id: #{proposal.id}) { author { username } } }"
-
-        result = ConsulSchema.execute(query_string, context: {}, variables: {})
-        returned_proposal = result['data']['proposal']
-
-        expect(returned_proposal['author']['username']).to eq(user.username)
-      end
-
-      it "with :has_many associations" do
-        proposal = create(:proposal)
-        create(:comment, body: "Blah Blah", author: user, commentable: proposal)
-        create(:comment, body: "I told ya", author: user, commentable: proposal)
-        query_string = "{ proposal(id: #{proposal.id}) { comments { edges { node { body } } } } }"
-
-        result = ConsulSchema.execute(query_string, context: {}, variables: {})
-        comments = result['data']['proposal']['comments']['edges'].collect { |edge| edge['node'] }
-        comment_bodies = comments.collect { |comment| comment['body'] }
-
-        expect(comment_bodies).to match_array(["Blah Blah", "I told ya"])
-      end
-    end
-
-    describe "does not expose confidential" do
-      let(:user) { create(:user) }
-
-      it "Int fields" do
-        query_string = "{ user(id: #{user.id}) { failed_census_calls_count } }"
-
-        result = ConsulSchema.execute(query_string, context: {}, variables: {})
-
-        expect(result['data']).to be_nil
-        expect(result['errors'].first['message']).to eq("Field 'failed_census_calls_count' doesn't exist on type 'User'")
-      end
-
-      it "String fields" do
-        query_string = "{ user(id: #{user.id}) { encrypted_password } }"
-
-        result = ConsulSchema.execute(query_string, context: {}, variables: {})
-
-        expect(result['data']).to be_nil
-        expect(result['errors'].first['message']).to eq("Field 'encrypted_password' doesn't exist on type 'User'")
-      end
-
-      it ":has_one associations" do
-        user.administrator = create(:administrator)
-        query_string = "{ user(id: #{user.id}) { administrator { id } } }"
-
-        result = ConsulSchema.execute(query_string, context: {}, variables: {})
-
-        expect(result['data']).to be_nil
-        expect(result['errors'].first['message']).to eq("Field 'administrator' doesn't exist on type 'User'")
       end
 
       it ":belongs_to associations" do
-        create(:failed_census_call, user: user)
-
-        query_string = "{ user(id: #{user.id}) { failed_census_calls { id } } }"
-
-        result = ConsulSchema.execute(query_string, context: {}, variables: {})
-
-        expect(result['data']).to be_nil
-        expect(result['errors'].first['message']).to eq("Field 'failed_census_calls' doesn't exist on type 'User'")
+        expect(returned_proposal['author']['username']).to eq(proposal_author.username)
       end
 
       it ":has_many associations" do
-        create(:direct_message, sender: user)
-        query_string = "{ user(id: #{user.id}) { direct_messages_sent { id } } }"
+        comments = returned_proposal['comments']['edges'].collect { |edge| edge['node'] }
+        comment_bodies = comments.collect { |comment| comment['body'] }
 
-        result = ConsulSchema.execute(query_string, context: {}, variables: {})
+        expect(comment_bodies).to match_array([comment_1.body, comment_2.body])
+      end
+    end
 
-        expect(result['data']).to be_nil
-        expect(result['errors'].first['message']).to eq("Field 'direct_messages_sent' doesn't exist on type 'User'")
+    describe "do not expose confidential" do
+      let(:user) { create(:user) }
+      subject(:data) { result['data'] }
+      subject(:errors) { result['errors'] }
+      subject(:error_msg) { errors.first['message'] }
+
+      describe "fields of Int type" do
+        let(:query_string) { "{ user(id: #{user.id}) { failed_census_calls_count } }" }
+
+        specify { expect(data).to be_nil }
+        specify { expect(error_msg).to eq("Field 'failed_census_calls_count' doesn't exist on type 'User'") }
       end
 
-      it "fields inside nested queries" do
-        proposal = create(:proposal, author: user)
-        query_string = "{ proposal(id: #{proposal.id}) { author { reset_password_sent_at } } }"
+      describe "fields of String type" do
+        let(:query_string) { "{ user(id: #{user.id}) { encrypted_password } }" }
 
-        result = ConsulSchema.execute(query_string, context: {}, variables: {})
+        specify { expect(data).to be_nil }
+        specify { expect(error_msg).to eq("Field 'encrypted_password' doesn't exist on type 'User'") }
+      end
 
-        expect(result['data']).to be_nil
-        expect(result['errors'].first['message']).to eq("Field 'reset_password_sent_at' doesn't exist on type 'User'")
+      describe "fields inside nested queries" do
+        let(:proposal) { create(:proposal, author: user) }
+        let(:query_string) { "{ proposal(id: #{proposal.id}) { author { reset_password_sent_at } } }" }
+
+        specify { expect(data).to be_nil }
+        specify { expect(error_msg).to eq("Field 'reset_password_sent_at' doesn't exist on type 'User'") }
+      end
+
+      describe ":has_one associations" do
+        let(:administrator) { create(:administrator) }
+        let(:query_string) { "{ user(id: #{user.id}) { administrator { id } } }" }
+
+        specify { expect(data).to be_nil }
+        specify { expect(error_msg).to eq("Field 'administrator' doesn't exist on type 'User'") }
+      end
+
+      describe ":belongs_to associations" do
+        let(:query_string) { "{ user(id: #{user.id}) { failed_census_calls { id } } }" }
+        let(:census_call) { create(:failed_census_call, user: user) }
+
+        specify { expect(data).to be_nil }
+        specify { expect(error_msg).to eq("Field 'failed_census_calls' doesn't exist on type 'User'") }
+      end
+
+      describe ":has_many associations" do
+        let(:message) { create(:direct_message, sender: user) }
+        let(:query_string) { "{ user(id: #{user.id}) { direct_messages_sent { id } } }" }
+
+        specify { expect(data).to be_nil }
+        specify { expect(error_msg).to eq("Field 'direct_messages_sent' doesn't exist on type 'User'") }
       end
     end
   end
@@ -132,11 +108,11 @@ describe ConsulSchema do
 
     let(:mrajoy) { create(:user, username: 'mrajoy') }
     let(:dtrump) { create(:user, username: 'dtrump') }
-    let(:context) {
+    let(:context) do
       { proposal_1: create(:proposal, id: 1, title: "Bajar el IVA", author: mrajoy) }
       { proposal_2: create(:proposal, id: 2, title: "Censurar los memes", author: mrajoy) }
       { proposal_3: create(:proposal, id: 3, title: "Construir un muro", author: dtrump) }
-    }
+    end
 
     it "return the appropiate fields" do
       proposals = result["data"]["proposals"]["edges"].collect { |edge| edge['node'] }