diff --git a/frontend/tests/acceptance/albums.js b/frontend/tests/acceptance/albums.js
index 489f75a0a..8f109b5a3 100644
--- a/frontend/tests/acceptance/albums.js
+++ b/frontend/tests/acceptance/albums.js
@@ -14,9 +14,6 @@ fixture `Test albums`
 
 const page = new Page();
 
-//search + filters?
-//views ?
-
 test('#1 Create/delete album', async t => {
     logger.clear();
     await t.click(Selector('.p-navigation-albums'));
@@ -46,7 +43,7 @@ test('#1 Create/delete album', async t => {
 
 });
 
-test('#1 Update album', async t => {
+test('#2 Update album', async t => {
     logger.clear();
     await t.click(Selector('.p-navigation-albums'));
     const request = await logger.requests[0].response.body;
@@ -131,7 +128,7 @@ test('#1 Update album', async t => {
 });
 
 //TODO test download itself + clipboard count after download
-test('#2 Download album', async t => {
+test('#3 Download album', async t => {
     logger.clear();
     await t.click(Selector('.p-navigation-albums'));
     const request = await logger.requests[0].response.body;
diff --git a/frontend/tests/acceptance/labels.js b/frontend/tests/acceptance/labels.js
index 348d47b25..fc825c56b 100644
--- a/frontend/tests/acceptance/labels.js
+++ b/frontend/tests/acceptance/labels.js
@@ -1,14 +1,220 @@
-//search?
+
 
 //views?
 
 //clipboard yes
 
-//show only high prio labels + check labels exist
+import { Selector } from 'testcafe';
+import testcafeconfig from './testcafeconfig';
+import Page from "./page-model";
+import { RequestLogger } from 'testcafe';
 
-//add label + delete label
+const logger = RequestLogger( /http:\/\/localhost:2342\/api\/v1\/*/ , {
+    logResponseHeaders: true,
+    logResponseBody:    true
+});
 
-//remove label
+fixture `Test labels`
+    .page`${testcafeconfig.url}`
+    .requestHooks(logger);
+
+const page = new Page();
+
+/*test('#1 Remove/Activate Add/Delete Label', async t => {
+    logger.clear();
+    await t.click(Selector('.p-navigation-labels'));
+    const request = await logger.requests[0].response.body;
+    const countImportantLabels = await Selector('div.p-label').count;
+    logger.clear();
+    await t
+        .click(Selector('button.action-show-all'));
+    const countAllLabels = await Selector('div.p-label').count;
+    await t
+        .expect(countAllLabels).gt(countImportantLabels)
+        .click(Selector('button.action-show-important'));
+    await page.search('beacon');
+    const LabelBeacon = await Selector('div.p-label').nth(0).getAttribute('data-uid');
+    await t
+        .click(Selector('div.p-label').withAttribute('data-uid', LabelBeacon));
+    const PhotoBeacon = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
+    await t
+        .click(Selector('.action-title-edit').withAttribute('data-uid', PhotoBeacon));
+    const PhotoTitle = await (Selector('.input-title input').value);
+    const PhotoKeywords = await (Selector('.input-keywords textarea').value);
+    await t
+        .expect(PhotoTitle).contains('Beacon')
+        .expect(PhotoKeywords).contains('beacon')
+        .click(Selector('#tab-edit-labels'))
+        .click(Selector('button.action-remove'))
+        .typeText(Selector('.input-label input'), 'Test')
+        .click(Selector('button.p-photo-label-add'))
+        .click(Selector('#tab-edit-details'));
+    const PhotoTitleAfterEdit = await (Selector('.input-title input').value);
+    const PhotoKeywordsAfterEdit = await (Selector('.input-keywords textarea').value);
+    await t
+        .expect(PhotoTitleAfterEdit).contains('Test')
+        .expect(PhotoKeywordsAfterEdit).contains('test')
+        .expect(PhotoTitleAfterEdit).notContains('Beacon')
+        .expect(PhotoKeywordsAfterEdit).notContains('beacon')
+        .click(Selector('.action-close'))
+        .click(Selector('.p-navigation-labels'));
+    await page.search('beacon');
+    await t
+        .expect(Selector('h3').withText('No labels matched your search').visible).ok();
+    await page.search('test');
+    const LabelTest = await Selector('div.p-label').nth(0).getAttribute('data-uid');
+    await t
+        .click(Selector('div.p-label').withAttribute('data-uid', LabelTest))
+        .click(Selector('.action-title-edit').withAttribute('data-uid', PhotoBeacon))
+        .click(Selector('#tab-edit-labels'))
+        .click(Selector('.action-delete'))
+        .click(Selector('.action-on'))
+        .click(Selector('#tab-edit-details'));
+    const PhotoTitleAfterUndo = await (Selector('.input-title input').value);
+    const PhotoKeywordsAfterUndo = await (Selector('.input-keywords textarea').value);
+    await t
+        .expect(PhotoTitleAfterUndo).contains('Beacon')
+        .expect(PhotoKeywordsAfterUndo).contains('beacon')
+        .expect(PhotoTitleAfterUndo).notContains('Test')
+        .expect(PhotoKeywordsAfterUndo).notContains('test')
+        .click(Selector('.action-close'))
+        .click(Selector('.p-navigation-labels'));
+    await page.search('test');
+    await t
+        .expect(Selector('h3').withText('No labels matched your search').visible).ok();
+    await page.search('beacon');
+    await t
+        .expect(Selector('div').withAttribute('data-uid', LabelBeacon).visible).ok();
+});
+
+//TODO check title of second image after index
+test('#2 Rename Label', async t => {
+    logger.clear();
+    await t.click(Selector('.p-navigation-labels'));
+    const request = await logger.requests[0].response.body;
+    await page.search('zebra');
+    const LabelZebra = await Selector('div.p-label').nth(0).getAttribute('data-uid');
+    await t
+        .click(Selector('div.p-label').withAttribute('data-uid', LabelZebra));
+    const FirstPhotoZebra = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
+    const SecondPhotoZebra = await Selector('div.p-photo').nth(1).getAttribute('data-uid');
+    await t
+        .click(Selector('.action-title-edit').withAttribute('data-uid', FirstPhotoZebra));
+    const FirstPhotoTitle = await (Selector('.input-title input').value);
+    const FirstPhotoKeywords = await (Selector('.input-keywords textarea').value);
+    await t
+        .expect(FirstPhotoTitle).contains('Zebra')
+        .expect(FirstPhotoKeywords).contains('zebra')
+        .click(Selector('#tab-edit-labels'))
+        .click(Selector('div.p-inline-edit'))
+        .typeText(Selector('.input-rename input'), 'Horse', { replace: true })
+        .pressKey('enter')
+        .click(Selector('#tab-edit-details'));
+    const FirstPhotoTitleAfterEdit = await (Selector('.input-title input').value);
+    const FirstPhotoKeywordsAfterEdit = await (Selector('.input-keywords textarea').value);
+    await t
+        .expect(FirstPhotoTitleAfterEdit).contains('Horse')
+        .expect(FirstPhotoKeywordsAfterEdit).contains('horse')
+        .expect(FirstPhotoTitleAfterEdit).notContains('Zebra')
+        .click(Selector('.action-close'))
+        .click(Selector('.p-navigation-labels'));
+    await page.search('horse');
+    await t
+        .expect(Selector('div').withAttribute('data-uid', LabelZebra).visible).ok()
+        .click(Selector('div.p-label').withAttribute('data-uid', LabelZebra))
+        .expect(Selector('div').withAttribute('data-uid', SecondPhotoZebra).visible).ok()
+        .click(Selector('.action-title-edit').withAttribute('data-uid', FirstPhotoZebra))
+        .click(Selector('#tab-edit-labels'))
+        .click(Selector('div.p-inline-edit'))
+        .typeText(Selector('.input-rename input'), 'Zebra', { replace: true })
+        .pressKey('enter')
+        .click(Selector('.action-close'))
+        .click(Selector('.p-navigation-labels'));
+    await page.search('horse');
+    await t
+        .expect(Selector('h3').withText('No labels matched your search').visible).ok();
+});
+
+test('#3 Add label to album', async t => {
+    logger.clear();
+    await t.click(Selector('.p-navigation-albums'));
+    const request = await logger.requests[0].response.body;
+    logger.clear();
+    await t
+        .typeText(Selector('.p-albums-search input'), 'Christmas')
+        .pressKey('enter');
+    const AlbumUid = await Selector('div.p-album').nth(0).getAttribute('data-uid');
+    logger.clear();
+    await t
+        .click(Selector('div.p-album').withAttribute('data-uid', AlbumUid));
+    const request2 = await logger.requests[0].response.body;
+    const PhotoCount = await Selector('div.p-photo').count;
+    await t
+        .click(Selector('.p-navigation-labels'));
+    await page.search('landscape');
+    const LabelLandscape = await Selector('div.p-label').nth(1).getAttribute('data-uid');
+    logger.clear();
+    await t
+        .click(Selector('div.p-label').withAttribute('data-uid', LabelLandscape));
+    const request3 = await logger.requests[0].response.body;
+    const FirstPhotoLandscape = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
+    const SecondPhotoLandscape = await Selector('div.p-photo').nth(1).getAttribute('data-uid');
+    await t
+        .click('.p-navigation-labels')
+    await page.selectFromUID(LabelLandscape);
+
+    const clipboardCount = await Selector('span.t-clipboard-count');
+    await t
+        .expect(clipboardCount.textContent).eql("1")
+        .click(Selector('button.p-label-clipboard-menu'))
+        .click(Selector('button.p-photo-clipboard-album'))
+        .typeText(Selector('.input-album input'), 'Christmas', { replace: true })
+        .click(Selector('div[role="listitem"]').withText('Christmas'))
+        .click(Selector('button.p-photo-dialog-confirm'))
+        .click(Selector('.p-navigation-albums'))
+        .click(Selector('div.p-album').withAttribute('data-uid', AlbumUid));
+    const request4 = await logger.requests[0].response.body;
+    const PhotoCountAfterAdd = await Selector('div.p-photo').count;
+    await t
+        .expect(PhotoCountAfterAdd).eql(PhotoCount + 2);
+    await page.selectFromUID(FirstPhotoLandscape);
+    await page.selectFromUID(SecondPhotoLandscape);
+    await page.removeSelected();
+    await t
+        .click('.action-reload');
+    const PhotoCountAfterDelete = await Selector('div.p-photo').count;
+    logger.clear();
+    await t
+        .expect(PhotoCountAfterDelete).eql(PhotoCountAfterAdd - 2);
+});*/
+
+//TODO Delete label
+test('#4 Delete label', async t => {
+    await t
+        .click(Selector('.p-navigation-labels'));
+    await page.search('dome');
+    const LabelDome = await Selector('div.p-label').nth(0).getAttribute('data-uid');
+    logger.clear();
+    await t
+        .click(Selector('div.p-label').withAttribute('data-uid', LabelDome));
+    const request3 = await logger.requests[0].response.body;
+    const FirstPhotoDome = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
+    await t
+        .click('.p-navigation-labels')
+    await page.selectFromUID(LabelDome);
+    const clipboardCount = await Selector('span.t-clipboard-count');
+    await t
+        .expect(clipboardCount.textContent).eql("1")
+        .click(Selector('button.p-label-clipboard-menu'))
+        .click(Selector('button.p-label-clipboard-delete'))
+        .click(Selector('button.p-photo-dialog-confirm'));
+    await page.search('dome');
+    await t
+        .expect(Selector('h3').withText('No labels matched your search').visible).ok()
+        .click('.p-navigation-photos')
+        .click(Selector('.action-title-edit').withAttribute('data-uid', FirstPhotoDome))
+        .click(Selector('#tab-edit-labels'))
+        .expect(Selector('div.p-inline-edit').innerText).eql('xxx');
+});
 
-//rename label
 
diff --git a/frontend/tests/acceptance/page-model.js b/frontend/tests/acceptance/page-model.js
index 0bea0beb3..69e602942 100644
--- a/frontend/tests/acceptance/page-model.js
+++ b/frontend/tests/acceptance/page-model.js
@@ -43,7 +43,7 @@ export default class Page {
 
     async search(term) {
         await t
-            .typeText(this.search1, term)
+            .typeText(this.search1, term, { replace: true })
             .pressKey('enter')
     }