diff --git a/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx b/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx
index 44d2e5a5..4e35342c 100644
--- a/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx
+++ b/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx
@@ -44,7 +44,7 @@ const ConnectionSettings = memo(function ConnectionSettings(props: Props) {
         <Grid container={true} spacing={3}>
           <Grid item={true} xs={8} className={classes.gridPadding}>
             <TextField
-              className={classes.fullWidth}
+              className={`${classes.fullWidth} advanced-connection-settings-topic-input`}
               label="Topic"
               placeholder="example/topic"
               margin="normal"
diff --git a/app/src/components/Demo/Mouse.tsx b/app/src/components/Demo/Mouse.tsx
index 6cbc2ecb..6bbb5204 100644
--- a/app/src/components/Demo/Mouse.tsx
+++ b/app/src/components/Demo/Mouse.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Theme, withStyles } from '@material-ui/core'
-const cursor = require('./cursor.png')
+import cursor from './cursor.png'
 
 interface State {
   enabled: boolean
diff --git a/app/tsconfig.json b/app/tsconfig.json
index 3b89ef3f..8787ed3e 100644
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -15,7 +15,7 @@
     "allowSyntheticDefaultImports": true
   },
   "include": ["./src/**/*"],
-  "exclude": ["**/*.d.ts"],
+  "exclude": ["**/*.d.ts", ".src/**/*.png"],
   "awesomeTypescriptLoaderOptions": {
     "useCache": true,
     "transpileModule": true,
diff --git a/src/spec/scenarios/showAdvancedConnectionSettings.ts b/src/spec/scenarios/showAdvancedConnectionSettings.ts
index 5745564e..e43aab9d 100644
--- a/src/spec/scenarios/showAdvancedConnectionSettings.ts
+++ b/src/spec/scenarios/showAdvancedConnectionSettings.ts
@@ -1,15 +1,16 @@
-import { Browser, Element } from 'webdriverio'
-import { clickOn, sleep, setTextInInput } from '../util'
+import { Browser } from 'webdriverio'
+import { clickOn, sleep, setInputText } from '../util'
 
 export async function showAdvancedConnectionSettings(browser: Browser) {
   const advancedSettingsButton = await browser.$('//button/span[contains(text(),"Advanced")]')
   const addButton = await browser.$('//button/span[contains(text(),"Add")]')
+  const topicInput = await browser.$('//*[contains(@class, "advanced-connection-settings-topic-input")]//input')
 
   await clickOn(advancedSettingsButton, browser)
-  await setTextInInput('Subscription', 'garden/#', browser)
+  await setInputText(topicInput, 'garden/#', browser)
   await clickOn(addButton, browser)
 
-  await setTextInInput('Subscription', 'livingroom/#', browser)
+  await setInputText(topicInput, 'livingroom/#', browser)
   await clickOn(addButton, browser)
 
   await deleteFirstSubscribedTopic(browser)
diff --git a/src/spec/util/index.ts b/src/spec/util/index.ts
index 18a68933..e69e49fd 100644
--- a/src/spec/util/index.ts
+++ b/src/spec/util/index.ts
@@ -37,6 +37,12 @@ export async function deleteTextWithBackspaces(element: Element, browser: Browse
   }
 }
 
+export async function setInputText(input: Element, text: string, browser: Browser) {
+  await clickOn(input, browser, 1)
+  await deleteTextWithBackspaces(input, browser)
+  await input.setValue(text)
+}
+
 export async function setTextInInput(name: string, text: string, browser: Browser) {
   const input = await browser.$(`//label[contains(text(), "${name}")]/..//input`)
   await clickOn(input, browser, 1)