diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js
index 294a28a76..a9991dfd9 100644
--- a/backend/src/schema/resolvers/shout.spec.js
+++ b/backend/src/schema/resolvers/shout.spec.js
@@ -10,12 +10,12 @@ const driver = getDriver()
 
 const mutationShoutPost = gql`
   mutation ($id: ID!) {
-    shout(id: $id, type: Post)
+    shout(id: $id, type: "Post")
   }
 `
 const mutationUnshoutPost = gql`
   mutation ($id: ID!) {
-    unshout(id: $id, type: Post)
+    unshout(id: $id, type: "Post")
   }
 `
 const queryPost = gql`
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index 546c7a748..62988f1f2 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -270,7 +270,6 @@ describe('login', () => {
 
         it('responds with "Incorrect email address or password."', async () => {
           await respondsWith({
-            data: null,
             errors: [{ message: 'Incorrect email address or password.' }],
           })
         })
@@ -283,7 +282,6 @@ describe('login', () => {
 
         it('responds with "Your account has been disabled."', async () => {
           await respondsWith({
-            data: null,
             errors: [{ message: 'Your account has been disabled.' }],
           })
         })
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 512671000..cd9fcb914 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -208,8 +208,8 @@ type Mutation {
   unpinPost(id: ID!): Post
   markTeaserAsViewed(id: ID!): Post
 
-  shout(id: ID!, type: String): Boolean
-  unshout(id: ID!, type: String): Boolean
+  shout(id: ID!, type: String!): Boolean
+  unshout(id: ID!, type: String!): Boolean
 }
 
 type Query {
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 378063ea4..4285e4443 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -227,7 +227,7 @@ type Mutation {
 
   requestPasswordReset(email: String!): Boolean
   resetPassword(nonce: String!, email: String!, newPassword: String!): Boolean
-  changePassword(oldPassword: String!, newPassword: String!): User
+  changePassword(oldPassword: String!, newPassword: String!): String
 
-  login(email: String!, password: String!): User
+  login(email: String!, password: String!): String
 }