diff --git a/client/cypress/integration/room-page.spec.js b/client/cypress/integration/room-page.spec.js
new file mode 100644
index 00000000..3a4dc1c6
--- /dev/null
+++ b/client/cypress/integration/room-page.spec.js
@@ -0,0 +1,17 @@
+describe('The Room Page', () => {
+  it.only('displays new room entry with author name', () => {
+    cy.login('rahel.cueni', 'test');
+
+    cy.visit('/room/ein-historisches-festival');
+    cy.get('[data-cy=add-room-entry-button]').click();
+    cy.get('.add-content-element:nth-child(1)').click();
+    cy.get('[data-cy=choose-text-widget]').click();
+    cy.get('[data-cy=modal-title-input] > .modal-input__inputfield').type('some title');
+
+    let text = 'something should be here';
+    cy.get('[data-cy=text-form-input]').type(text);
+    cy.get('[data-cy=modal-save-button]').click();
+
+    cy.get('.room-entry__content:first').should('contain', text).should('contain', 'Rahel Cueni');
+  });
+});
diff --git a/client/cypress/integration/rooms-page.spec.js b/client/cypress/integration/rooms-page.spec.js
index ce510a85..82f6ec11 100644
--- a/client/cypress/integration/rooms-page.spec.js
+++ b/client/cypress/integration/rooms-page.spec.js
@@ -1,9 +1,16 @@
 describe('The Rooms Page', () => {
-  it.only('goes to the rooms page', () => {
-    cy.login('rahel.cueni', 'test');
+  it('goes to the rooms page', () => {
+    cy.login('nico.zickgraf', 'test');
 
     cy.visit('/rooms');
 
     cy.get('.add-room').should('exist');
   });
+  it('add room should not exist for student', () => {
+    cy.login('rahel.cueni', 'test');
+
+    cy.visit('/rooms');
+
+    cy.get('.add-room').should('not.exist');
+  });
 });
diff --git a/client/src/components/content-block-form/ContentsForm.vue b/client/src/components/content-block-form/ContentsForm.vue
index 0bf84b87..ea12a699 100644
--- a/client/src/components/content-block-form/ContentsForm.vue
+++ b/client/src/components/content-block-form/ContentsForm.vue
@@ -4,7 +4,9 @@
       <modal-input v-on:input="updateTitle"
                    :placeholder="titlePlaceholder"
                    :value="localContentBlock.title"
-                   :error="error"></modal-input>
+                   :error="error"
+                   data-cy="modal-title-input"
+      ></modal-input>
       <checkbox v-if="showTaskSelection"
                 :checked="localContentBlock.isAssignment"
                 :item="localContentBlock"
@@ -56,7 +58,7 @@
     </div>
 
     <div slot="footer">
-      <a class="button button--primary" v-on:click="save">Speichern</a>
+      <a class="button button--primary" data-cy="modal-save-button" v-on:click="save">Speichern</a>
       <a class="button" v-on:click="$emit('hide')">Abbrechen</a>
     </div>
   </modal>
@@ -291,7 +293,7 @@
       grid-column: 1 / span 2;
     }
 
-     &__task {
+    &__task {
       margin: 15px 0 10px;
     }
   }
diff --git a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue
index 73f68e00..45756621 100644
--- a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue
+++ b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue
@@ -1,26 +1,38 @@
 <template>
   <div class="content-block-element-chooser-widget">
-    <div class="content-block-element-chooser-widget__link" v-on:click="$emit('change-type', index, 'link_block')">
+    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--link"
+         data-cy="choose-link-widget"
+         v-on:click="$emit('change-type', index, 'link_block')">
       <link-icon class="content-block-element-chooser-widget__link-icon"></link-icon>
       <div class="content-block-element-chooser-widget__link-title">Link</div>
     </div>
-    <div class="content-block-element-chooser-widget__link" v-on:click="$emit('change-type', index, 'video_block')">
+    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--video"
+         data-cy="choose-video-widget"
+         v-on:click="$emit('change-type', index, 'video_block')">
       <video-icon class="content-block-element-chooser-widget__link-icon"></video-icon>
       <div class="content-block-element-chooser-widget__link-title">Video</div>
     </div>
-    <div class="content-block-element-chooser-widget__link" v-on:click="$emit('change-type', index, 'image_url_block')">
+    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--image"
+         data-cy="choose-image-widget"
+         v-on:click="$emit('change-type', index, 'image_url_block')">
       <image-icon class="content-block-element-chooser-widget__link-icon"></image-icon>
       <div class="content-block-element-chooser-widget__link-title">Bild</div>
     </div>
-    <div class="content-block-element-chooser-widget__link" v-on:click="$emit('change-type', index, 'text_block')">
+    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--text"
+         data-cy="choose-text-widget"
+         v-on:click="$emit('change-type', index, 'text_block')">
       <text-icon class="content-block-element-chooser-widget__link-icon"></text-icon>
       <div class="content-block-element-chooser-widget__link-title">Text</div>
     </div>
-    <div class="content-block-element-chooser-widget__link" v-on:click="$emit('change-type', index, 'assignment')">
+    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--assignment"
+         data-cy="choose-assignment-widget"
+         v-on:click="$emit('change-type', index, 'assignment')">
       <speech-bubble-icon class="content-block-element-chooser-widget__link-icon"></speech-bubble-icon>
       <div class="content-block-element-chooser-widget__link-title">Aufgabe&nbsp;& Ergebnis</div>
     </div>
-    <div class="content-block-element-chooser-widget__link" v-on:click="$emit('change-type', index, 'document_block')">
+    <div class="content-block-element-chooser-widget__link content-block-element-chooser-widget__link--document"
+         data-cy="choose-document-widget"
+         v-on:click="$emit('change-type', index, 'document_block')">
       <document-icon class="content-block-element-chooser-widget__link-icon"></document-icon>
       <div class="content-block-element-chooser-widget__link-title">Dokument</div>
     </div>
diff --git a/client/src/components/content-forms/TextForm.vue b/client/src/components/content-forms/TextForm.vue
index 94af1ec4..fde36d1f 100644
--- a/client/src/components/content-forms/TextForm.vue
+++ b/client/src/components/content-forms/TextForm.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="text-form">
     <textarea class="text-form__input skillbox-textarea"
+              data-cy="text-form-input"
               placeholder="Text erfassen..."
               :value="text"
               v-on:input="$emit('text-change-value', $event.target.value, index)"></textarea>
diff --git a/client/src/components/rooms/AddRoomEntryButton.vue b/client/src/components/rooms/AddRoomEntryButton.vue
index 3ce88b7c..229f2efe 100644
--- a/client/src/components/rooms/AddRoomEntryButton.vue
+++ b/client/src/components/rooms/AddRoomEntryButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="add-room-entry-button" @click="addRoomEntry">
+  <div class="add-room-entry-button" data-cy="add-room-entry-button" @click="addRoomEntry">
     <add-icon class="add-room-entry-button__icon"></add-icon>
   </div>
 </template>