diff --git a/cypress/integration/article.spec.js b/cypress/integration/article.spec.js
index f740d89..9cb01da 100644
--- a/cypress/integration/article.spec.js
+++ b/cypress/integration/article.spec.js
@@ -6,10 +6,9 @@ describe('Article', () => {
         cy.register().then((email) => {
             cy.login(email)
         })
-        cy.visit('/editor/')
     })
-
     it('can create a new article', () => {
+        cy.visit('/editor/')
         cy.get(editor.titleField).type('My post title')
         cy.get(editor.aboutField).type('Cypress')
         cy.get(editor.bodyField).type('Cypress is so cool awyeah')
@@ -18,4 +17,39 @@ describe('Article', () => {
         cy.get(article.title).should('be.visible')
             .and('have.text', 'My post title')
     })
+
+    it('can edit an article', () => {
+        // we already know if creating an article works or not from the first test
+        // we can now use shortcut (cy.createArticle() command) to test other scenarios
+        cy.createArticle().then((link) => {
+            cy.visit(`/editor/${link}`)
+        })
+        cy.get(editor.titleField).should('be.visible')
+            // to check field value, use have.value not have.text
+            .and('have.value', 'My Cypress article')
+        cy.get(editor.aboutField).should('be.visible')
+            .and('have.value', 'https://github.com/helenanull/cypress-example')
+        cy.get(editor.bodyField)
+            .should('have.value', 'This article is created by createArticle Cypress command')
+            .clear()
+            .type('This is modified body')
+        cy.get(editor.publishButton).click()
+        cy.url().should('contain', '/article/my-cypress-article-')
+        cy.get(article.title).should('be.visible')
+        cy.get(article.body).should('be.visible')
+            .and('have.text', 'This is modified body')
+    })
+
+    it('can delete an article', () => {
+        cy.intercept('DELETE', '/api/articles/**').as('deleteRequest')
+        cy.createArticle().then((link) => {
+            cy.visit(`/article/${link}`)
+        })
+        cy.get(article.title).should('be.visible')
+        cy.get(article.deleteButton).click()
+        cy.wait('@deleteRequest').then((req) => {
+            expect(req.response.statusCode).to.eq(200)
+        })
+        cy.url().should('eq', `${Cypress.config('baseUrl')}/`)
+    })
 })
diff --git a/cypress/selectors/article.sel.js b/cypress/selectors/article.sel.js
index c27d976..4841bfc 100644
--- a/cypress/selectors/article.sel.js
+++ b/cypress/selectors/article.sel.js
@@ -1,3 +1,6 @@
 module.exports = {
-    title: '[ng-bind="::$ctrl.article.title"]'
+    title: '[ng-bind="::$ctrl.article.title"]',
+    body: '[ng-bind-html*="ctrl.article.body"] p',
+    editButton: 'h1 + article-actions [ui-sref*="ctrl.article.slug"]',
+    deleteButton: 'h1 + article-actions .btn-outline-danger'
 }
diff --git a/cypress/support/article.cmd.js b/cypress/support/article.cmd.js
new file mode 100644
index 0000000..8852865
--- /dev/null
+++ b/cypress/support/article.cmd.js
@@ -0,0 +1,21 @@
+Cypress.Commands.add('createArticle', () => {
+    cy.request({
+        url: 'https://conduit.productionready.io/api/articles',
+        method: 'POST',
+        headers: {
+            authorization: `Token ${window.localStorage.getItem('jwtToken')}`
+        },
+        body: {
+            article: {
+                title: 'My Cypress article',
+                description: 'https://github.com/helenanull/cypress-example',
+                body: 'This article is created by createArticle Cypress command',
+                tagList: []
+            }
+        }
+    })
+        .then((response) => {
+            expect(response.status).to.eq(200)
+            return response.body.article.slug
+        })
+})
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
deleted file mode 100644
index ca4d256..0000000
--- a/cypress/support/commands.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add("login", (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/cypress/support/index.js b/cypress/support/index.js
index bc17ddf..019da5d 100644
--- a/cypress/support/index.js
+++ b/cypress/support/index.js
@@ -16,6 +16,7 @@
 // Import commands.js using ES2015 syntax:
 import './login.cmd'
 import './register.cmd'
+import './article.cmd'
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
diff --git a/cypress/support/register.cmd.js b/cypress/support/register.cmd.js
index 1228b54..9cea48a 100644
--- a/cypress/support/register.cmd.js
+++ b/cypress/support/register.cmd.js
@@ -14,6 +14,10 @@ Cypress.Commands.add('register', () => {
     })
         .then((response) => {
             expect(response.status).to.eq(200)
-            return email
+            cy.log('**user created**')
+            cy.log(`**email: ${email}**`)
+            cy.log('**password: Testtest1**')
         })
+        // return email so that we can use that to log in
+        .then(() => email)
 })