diff --git a/client/components/repository/common/ActivityOptions/Menu.vue b/client/components/repository/common/ActivityOptions/Menu.vue
index d5c911734..c19f7b44e 100644
--- a/client/components/repository/common/ActivityOptions/Menu.vue
+++ b/client/components/repository/common/ActivityOptions/Menu.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <v-menu max-width="350" offset-y left>
+    <v-menu max-width="350" offset-y left aria-label="additional options">
       <template #activator="{ on }">
         <v-btn v-on="on" color="primary darken-3" icon tile>
           <v-icon>mdi-dots-vertical</v-icon>
diff --git a/cypress/e2e/catalog/create-repository.cy.js b/cypress/e2e/catalog/create-repository.cy.js
index 17ee8ce83..6fc975199 100644
--- a/cypress/e2e/catalog/create-repository.cy.js
+++ b/cypress/e2e/catalog/create-repository.cy.js
@@ -1,6 +1,7 @@
 import { findRepositoryCard } from './utils';
 
 const getDialog = () => cy.findByRole('dialog');
+const chance = require('chance').Chance();
 
 describe('create repository', () => {
   before(() => cy.visit('/'));
@@ -11,15 +12,14 @@ describe('create repository', () => {
   });
 
   it('should create a new repository using the create dialog', () => {
-    const repositoryName = `Test_repository_${(new Date()).getTime()}`;
+    const repositoryName = `Repository - ${chance.sentence({ words: 5 })}`;
     cy.findByRole('button', { name: 'Add repository' }).click();
     getDialog().within(() => {
       cy.findByLabelText(/name/i)
         .type(repositoryName);
       cy.findByLabelText(/description/i)
         .type('Test description');
-      cy.findByRole('button', { name: /create/i })
-        .click();
+      cy.findByRole('button', { name: /create/i }).click();
     });
     findRepositoryCard(repositoryName);
   });
diff --git a/cypress/e2e/catalog/search-and-filter.cy.js b/cypress/e2e/catalog/search-and-filter.cy.js
index 5a15f5beb..3cbfca72b 100644
--- a/cypress/e2e/catalog/search-and-filter.cy.js
+++ b/cypress/e2e/catalog/search-and-filter.cy.js
@@ -1,4 +1,4 @@
-import { findRepositoryCard, searchRepository } from './utils.js';
+import { findRepositoryCard, searchRepository } from './utils';
 
 describe('ability to search and filter repository catalog', () => {
   before(() => cy.visit('/'));
diff --git a/cypress/e2e/repository/settings/delete-repository.cy.js b/cypress/e2e/repository/settings/delete-repository.cy.js
new file mode 100644
index 000000000..a32300eda
--- /dev/null
+++ b/cypress/e2e/repository/settings/delete-repository.cy.js
@@ -0,0 +1,26 @@
+import { findRepositoryCard } from '../../catalog/utils';
+
+describe('delete repository', () => {
+  before(function () {
+    cy.visit('/');
+  });
+
+  beforeEach(function () {
+    cy.login();
+    cy.createRepository()
+      .as('repository')
+      .then(({ id: repositoryId }) => {
+        cy.navigateTo({
+          name: 'repository-info',
+          params: { repositoryId }
+        });
+      });
+  });
+
+  it('should be able to delete the repository', function () {
+    cy.findByRole('button', { name: 'delete' }).click();
+    cy.confirmAction('Delete repository?');
+    cy.assertRoute('catalog');
+    findRepositoryCard(this.repository.name).should('not.exist');
+  });
+});
diff --git a/cypress/e2e/repository/structure/activity-deletion.cy.js b/cypress/e2e/repository/structure/activity-deletion.cy.js
new file mode 100644
index 000000000..829386949
--- /dev/null
+++ b/cypress/e2e/repository/structure/activity-deletion.cy.js
@@ -0,0 +1,29 @@
+import {
+  findActivityItem
+} from './utils';
+
+describe('ability to delete child activities', () => {
+  beforeEach(function () {
+    cy.visit('/');
+    cy.login();
+    cy.createRepository()
+      .as('repository')
+      .then(({ id: repositoryId }) => {
+        cy.seedActivities(repositoryId).as('activities');
+        cy.openRepository(repositoryId);
+      });
+  });
+
+  it('should be able to delete the module', function () {
+    const { module } = this.activities;
+    clickActivityRemove(module.data.name);
+    cy.confirmAction('Delete item?');
+    findActivityItem(module.data.name).should('not.exist');
+  });
+});
+
+function clickActivityRemove(name) {
+  findActivityItem(name).click().within(() => {
+    cy.vMenu('additional options', /remove/i);
+  });
+}
diff --git a/cypress/e2e/repository/structure/child-activity-creation.cy.js b/cypress/e2e/repository/structure/child-activity-creation.cy.js
index 1fd9028ac..d5fb34861 100644
--- a/cypress/e2e/repository/structure/child-activity-creation.cy.js
+++ b/cypress/e2e/repository/structure/child-activity-creation.cy.js
@@ -26,15 +26,17 @@ describe('ability to create child activities', () => {
   });
 
   CHILD_ACTIVITY_TYPES.forEach(type => {
-    it(`create a "${type}" within "${PARENT_TYPE}" using the add into button`, function () {
-      cy.get(this.parent).findByRole('button', { name: /add item into/i }).click();
+    it(`create a "${type}" activity within "${PARENT_TYPE}" activity using the add into button`, function () {
+      cy.get(this.parent)
+        .findByRole('button', { name: /add item into/i })
+        .click();
       const name = generateActivityName(type);
       getActivityDialog().within(() => {
         cy.vSelect('Type', type);
         cy.findByLabelText('Name').type(`${name}{enter}`);
         cy.findByRole('button', { name: /create/i }).click();
       });
-      findActivityItem(name);
+      findActivityItem(name).should('be.visible');
     });
   });
 });
diff --git a/cypress/e2e/repository/structure/root-activity-creation.cy.js b/cypress/e2e/repository/structure/root-activity-creation.cy.js
index 009d6f176..2c1907ce3 100644
--- a/cypress/e2e/repository/structure/root-activity-creation.cy.js
+++ b/cypress/e2e/repository/structure/root-activity-creation.cy.js
@@ -23,10 +23,10 @@ describe('ability to create root activities', () => {
   });
 
   ROOT_ACTIVIY_TYPES.forEach(type => {
-    it(`should create a "${type}" using the add button`, function () {
+    it(`should create a "${type}" activity using the add into button`, function () {
       const name = generateActivityName(type);
       createRootActivity(name, type);
-      findActivityItem(name);
+      findActivityItem(name).should('be.visible');
     });
   });
 
diff --git a/cypress/e2e/repository/structure/utils.js b/cypress/e2e/repository/structure/utils.js
index 0dc67530a..3ae3b5cce 100644
--- a/cypress/e2e/repository/structure/utils.js
+++ b/cypress/e2e/repository/structure/utils.js
@@ -7,16 +7,18 @@ const sel = {
   addRootBtn: 'repository__createRootActivityBtn'
 };
 
-export const generateActivityName = type => `${type} - ${(new Date()).getTime()}`;
+const chance = require('chance').Chance();
 
 export const getActivityDialog = () => cy.findByTestId(sel.addDialog);
 export const getRootActivityDialog = () => cy.findByTestId(sel.addRootDialog);
 
+export const generateActivityName = type => `${type} - ${chance.sentence({ words: 5 })}`;
+
 export function createRootActivity(name, type) {
   cy.findByTestId(sel.addRootBtn).click();
   return getRootActivityDialog().within(() => {
     cy.vSelect('Type', type);
-    cy.findByLabelText('Name').type(`${name}{enter}`);
+    cy.findByLabelText('Name').type(`${name}`);
     cy.findByRole('button', { name: /create/i }).click();
   });
 }
diff --git a/cypress/support/e2e/activity.js b/cypress/support/e2e/activity.js
index 065e95d0c..ed6aae668 100644
--- a/cypress/support/e2e/activity.js
+++ b/cypress/support/e2e/activity.js
@@ -1,11 +1,12 @@
-const generateName = (prefix = 'Activity') => `${prefix} - ${(new Date()).getTime()}`;
-
 const ACTIVITY_TYPES = {
   MODULE: 'TEST_SCHEMA/MODULE',
   LESSON: 'TEST_SCHEMA/LESSON',
   PAGE: 'TEST_SCHEMA/PAGE'
 };
 
+const chance = require('chance').Chance();
+const generateName = (prefix = 'Activity') => `${prefix} - ${chance.sentence({ words: 5 })}`;
+
 const SAVE_ACTIVITY_ACTION = 'repository/activities/save';
 const SET_ENDPOINT_ACTION = 'repository/activities/setEndpoint';
 
diff --git a/cypress/support/e2e/common.js b/cypress/support/e2e/common.js
index 4d858de42..4b7dda593 100644
--- a/cypress/support/e2e/common.js
+++ b/cypress/support/e2e/common.js
@@ -5,6 +5,14 @@ Cypress.Commands.add('getRouter', () => cy.getApp().its('$router'));
 Cypress.Commands.add('getRoute', () => cy.getApp().its('$route'));
 Cypress.Commands.add('getRouteName', () => cy.getRoute().its('name'));
 Cypress.Commands.add('assertRoute', name => cy.getRouteName().should('eq', name));
+Cypress.Commands.add('navigateTo', route => cy.getRouter().then(router => {
+  router.replace(route).then(route => {
+    // TODO: Find a better way to make sure the components are loaded
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(1);
+    return route;
+  });
+}));
 
 // Confirmation dialog actions
 Cypress.Commands.add('confirmAction', dialogTitle => {
@@ -20,7 +28,7 @@ Cypress.Commands.add('cancelAction', dialogTitle => {
 
 const getDialogByTitle = dialogTitle => {
   return cy.root()
-    .findAllByRole('document')
+    .findAllByRole('dialog')
     .filter(`:contains("${dialogTitle}")`)
     .eq(0);
 };
diff --git a/cypress/support/e2e/index.js b/cypress/support/e2e/index.js
index 76f210674..188498109 100644
--- a/cypress/support/e2e/index.js
+++ b/cypress/support/e2e/index.js
@@ -25,10 +25,10 @@
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
 
 import '@testing-library/cypress/add-commands';
-import './common';
-import './schema';
 import './api';
 import './auth';
+import './common';
 import './repository';
+import './schema';
 import './activity';
 import './vuetify';
diff --git a/cypress/support/e2e/repository.js b/cypress/support/e2e/repository.js
index 6e472f9a7..7d1c70542 100644
--- a/cypress/support/e2e/repository.js
+++ b/cypress/support/e2e/repository.js
@@ -1,6 +1,6 @@
-const generateName = () => `Test repository - ${(new Date()).getTime()}`;
+const chance = require('chance').Chance();
 
-Cypress.Commands.add('createRepository', (name = generateName()) => {
+Cypress.Commands.add('createRepository', (name = `Repository - ${chance.sentence({ words: 5 })}`) => {
   return cy.getTestSchema().then(schema => {
     return cy.getStore().invoke('dispatch', 'repositories/create', {
       schema: schema.id,
diff --git a/cypress/support/e2e/vuetify/vMenu.js b/cypress/support/e2e/vuetify/vMenu.js
new file mode 100644
index 000000000..b1edb7d9f
--- /dev/null
+++ b/cypress/support/e2e/vuetify/vMenu.js
@@ -0,0 +1,4 @@
+Cypress.Commands.add('vMenu', (inputLabel, option) => {
+  cy.findByLabelText(inputLabel).parent().click();
+  cy.findAllByRole('menuitem').contains(option).click();
+});
diff --git a/package-lock.json b/package-lock.json
index c73fb1efe..77e45c0ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,6 +27,7 @@
         "body-parser": "^1.20.0",
         "boxen": "^4.1.0",
         "bunyan": "^1.8.15",
+        "chance": "^1.1.8",
         "change-case": "^4.1.2",
         "cheerio": "^1.0.0-rc.12",
         "consolidate": "^0.16.0",
@@ -11051,6 +11052,11 @@
         "node": ">=4"
       }
     },
+    "node_modules/chance": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/chance/-/chance-1.1.8.tgz",
+      "integrity": "sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg=="
+    },
     "node_modules/change-case": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz",
@@ -44367,6 +44373,11 @@
         "supports-color": "^5.3.0"
       }
     },
+    "chance": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/chance/-/chance-1.1.8.tgz",
+      "integrity": "sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg=="
+    },
     "change-case": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz",
diff --git a/package.json b/package.json
index 8318ac825..f465277e2 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     "body-parser": "^1.20.0",
     "boxen": "^4.1.0",
     "bunyan": "^1.8.15",
+    "chance": "^1.1.8",
     "change-case": "^4.1.2",
     "cheerio": "^1.0.0-rc.12",
     "consolidate": "^0.16.0",