diff --git a/src/__tests__/casperjs/helper_bar_intl_test.js b/src/__tests__/casperjs/helper_bar_intl_test.js
index a2f9e50d..37f74793 100644
--- a/src/__tests__/casperjs/helper_bar_intl_test.js
+++ b/src/__tests__/casperjs/helper_bar_intl_test.js
@@ -15,7 +15,7 @@ casper.start(
     .then(function() {
       this.mouse.click('a.intl');
     })
-    .then(CasperUtils.waits.selectorVisible(
+    .waitFor(CasperUtils.waits.selectorVisible(
       'a.english'
     ))
     .wait(1000)
diff --git a/src/__tests__/casperjs/level_dropdown_test.js b/src/__tests__/casperjs/level_dropdown_test.js
index 704ccadb..837c769b 100644
--- a/src/__tests__/casperjs/level_dropdown_test.js
+++ b/src/__tests__/casperjs/level_dropdown_test.js
@@ -46,7 +46,6 @@ casper.start(
     .then(function() {
       this.mouse.click('div[data-id="remote"]');
     })
-    .then(CasperUtils.waits.idVisible('levelIcon-remote1'))
     .wait(1000)
     .then(CasperUtils.asserts.visibleIDs(
       levelIconIDsForPages(5, numLevelSequences)
diff --git a/src/__tests__/casperjs/level_objective_test.js b/src/__tests__/casperjs/level_objective_test.js
index 3e8101ec..fdd08a7a 100644
--- a/src/__tests__/casperjs/level_objective_test.js
+++ b/src/__tests__/casperjs/level_objective_test.js
@@ -15,9 +15,6 @@ casper.start(
     .then(function() {
       this.mouse.click('#show-objective');
     })
-    .then(CasperUtils.waits.selectorVisible(
-      'p.commandLine.processing'
-    ))
     .wait(1000)
     .then(CasperUtils.screenshot.entirePage)
     .then(CasperUtils.asserts.visibleSelectors([
diff --git a/src/__tests__/casperjs/level_show_goal_test.js b/src/__tests__/casperjs/level_show_goal_test.js
index c8cdb30b..1cb20a80 100644
--- a/src/__tests__/casperjs/level_show_goal_test.js
+++ b/src/__tests__/casperjs/level_show_goal_test.js
@@ -15,9 +15,6 @@ casper.start(
     .then(function() {
       this.mouse.click('#show-goal');
     })
-    .then(CasperUtils.waits.selectorVisible(
-      'p.helperText'
-    ))
     .wait(1000)
     .then(CasperUtils.screenshot.entirePage)
     .then(CasperUtils.asserts.visibleSelector('p.helperText'))
diff --git a/src/__tests__/casperjs/level_solved_test.js b/src/__tests__/casperjs/level_solved_test.js
new file mode 100644
index 00000000..1828a920
--- /dev/null
+++ b/src/__tests__/casperjs/level_solved_test.js
@@ -0,0 +1,17 @@
+var CasperUtils = require('./casperUtils').CasperUtils;
+
+casper.start(
+  CasperUtils.getUrlForCommands([
+    'level intro1 --noIntroDialog --noStartCommand',
+    'git commit',
+    'git commit'
+  ]),
+  function() {
+    this.test.assertTitle('Learn Git Branching');
+    casper.waitFor(CasperUtils.waits.jsMount)
+    .wait(1000)
+    .waitFor(CasperUtils.waits.allCommandsFinished)
+    .then(CasperUtils.screenshot.entirePage)
+    .then(CasperUtils.testDone);
+
+}).run();
diff --git a/src/__tests__/casperjs/locale_comand_test.js b/src/__tests__/casperjs/locale_comand_test.js
index faed7513..e91b8412 100644
--- a/src/__tests__/casperjs/locale_comand_test.js
+++ b/src/__tests__/casperjs/locale_comand_test.js
@@ -8,11 +8,7 @@ casper.start(
     this.test.assertTitle('Learn Git Branching');
 
     casper.waitFor(CasperUtils.waits.jsMount)
-    .then(CasperUtils.waits.allCommandsFinished)
-    .then(CasperUtils.asserts.intlKeyReturns(
-      'learn-git-branching',
-      "Apprenez Git Branching"
-    ))
+    .waitFor(CasperUtils.waits.allCommandsFinished)
     .then(CasperUtils.asserts.selectorContainsText(
       'span[data-intl="learn-git-branching"]',
       "APPRENEZ GIT BRANCHING"