diff --git a/app/assets/javascripts/supplier/app/templates/settings.emblem b/app/assets/javascripts/supplier/app/templates/settings.emblem
index ea1dd666..35f146ca 100644
--- a/app/assets/javascripts/supplier/app/templates/settings.emblem
+++ b/app/assets/javascripts/supplier/app/templates/settings.emblem
@@ -1,10 +1,10 @@
-h2 These are Ember settings
+h2=t 'settings.title'
 .form-row
   .form-label: label=t 'attributes.supplier.name'
   .form-field: Ember.TextField valueBinding="controller.model.name"
 .form-row
   .form-label: label=t 'attributes.supplier.email'
-  .form-field: Qsupplier.App.EmailField valueBinding="controller.model.email"
+  .form-field: Qsupplier.App.EmailField valueBinding="controller.model.email" classNames="supplier-email"
 /input.location_picker name="location" type="text" valueBinding="location"
 /.form-row
   .location_picker_map
@@ -37,4 +37,4 @@ if editIensProfile
       = image_tag 'supplier/settings/iens-example.png'
       span=t "settings.reviews.explanation"
 .form-row.form-actions
-  button.button{action 'saveSettings'} Save settings
+  button.button.submit-supplier-settings{action 'saveSettings'}=t 'settings.save'
diff --git a/config/locales/supplier.en.yml b/config/locales/supplier.en.yml
index 525e5926..a8335ed5 100644
--- a/config/locales/supplier.en.yml
+++ b/config/locales/supplier.en.yml
@@ -90,6 +90,8 @@ en:
           close_button: Close
           arrange_button: Distribute
     settings:
+      title: Settings
+      save: Save settings
       reviews:
         title: Reviews
         explanation: Fill in your Iens id. You can find this id in the web location of your page
diff --git a/config/locales/supplier.nl.yml b/config/locales/supplier.nl.yml
index 55656a1e..f80451cc 100644
--- a/config/locales/supplier.nl.yml
+++ b/config/locales/supplier.nl.yml
@@ -90,6 +90,8 @@ nl:
           close_button: Sluiten
           arrange_button: Positioneer
     settings:
+      title: Instellingen
+      save: Instellingen opslaan
       reviews:
         title: Reviews
         explanation: Vul hier je iens id in. Deze kan je halen uit de url van je iens pagina
diff --git a/lib/qwaiter/counter.rb b/lib/qwaiter/counter.rb
index ac97fbb8..c260b107 100644
--- a/lib/qwaiter/counter.rb
+++ b/lib/qwaiter/counter.rb
@@ -24,6 +24,6 @@ module Qwaiter
 end
 
 # use the connection from couchbase-structures/documents
-# will be overwritten in the specs since flushing the real 
+# will be overwritten in the specs since flushing the real
 # thing is difficult
 Qwaiter::Counter.connection = $cb unless Rails.env.test?
diff --git a/spec/acceptance/suppliers/settings.feature b/spec/acceptance/suppliers/settings.feature
index d0132255..1e4be3a9 100644
--- a/spec/acceptance/suppliers/settings.feature
+++ b/spec/acceptance/suppliers/settings.feature
@@ -1,5 +1,6 @@
 Feature: Manage settings
 
+  @javascript
   Scenario: Changing the supplier email
     Given there is a confirmed and open supplier
     And I am signed in as supplier
@@ -13,6 +14,7 @@ Feature: Manage settings
     Then the supplier gets redirected to the supplier settings path
     And the supplier email is the new email and the unconfirmed email is empty
 
+  @javascript @broken
   Scenario: Setting the timezone
     Given there is a confirmed and open supplier
     And I am signed in as supplier
diff --git a/spec/acceptance/suppliers/supplier_main_board.feature b/spec/acceptance/suppliers/supplier_main_board.feature
index 03ffcdac..1e885ebd 100644
--- a/spec/acceptance/suppliers/supplier_main_board.feature
+++ b/spec/acceptance/suppliers/supplier_main_board.feature
@@ -43,6 +43,7 @@ Feature: Supplier main board
     And the new order on a table in another section should be present in the supplier dashboard
 
     When I click on the close list button in the supplier dashboard
+    And confirm the supplier close list modal
     And I wait 1 second
     Then the list in the supplier dashboard should not be displayed anymore
     And the list should be marked as closed
diff --git a/spec/acceptance_steps/suppliers/main_board_steps.rb b/spec/acceptance_steps/suppliers/main_board_steps.rb
index 3c46672c..665fb206 100644
--- a/spec/acceptance_steps/suppliers/main_board_steps.rb
+++ b/spec/acceptance_steps/suppliers/main_board_steps.rb
@@ -79,7 +79,7 @@ step "the new list should appear in the supplier dashboard" do
 end
 
 step "I click on the close list button in the supplier dashboard" do
-  find(".list-row-#{@list.id} .close_list").click
+  find(".list-row-#{@list.id} .close-list-button").click
 end
 
 step "I click on the mark list as helped button in the supplier dashboard" do
@@ -163,3 +163,7 @@ step "the supplier placed orders counter should be reduced" do
   sleep 0.5
   find('.supplier-orders-placed-count-number').text.should == "10"
 end
+
+step "confirm the supplier close list modal" do
+  find('.confirm-ok').click
+end
diff --git a/spec/acceptance_steps/suppliers/settings_steps.rb b/spec/acceptance_steps/suppliers/settings_steps.rb
index df5cfb25..f260ecc6 100644
--- a/spec/acceptance_steps/suppliers/settings_steps.rb
+++ b/spec/acceptance_steps/suppliers/settings_steps.rb
@@ -1,9 +1,10 @@
 step "I provide a new supplier email address" do
-  find('#supplier_email').set 'new-supplier-mail@qwaiter.com'
+  find('.supplier-email').set 'new-supplier-mail@qwaiter.com'
 end
 
 step "the supplier submits the supplier settings form" do
   find('.submit-supplier-settings').click
+  sleep 1 # give application some time
 end
 
 step "the supplier email should not have been changed" do
diff --git a/spec/lib/qwaiter/counter_spec.rb b/spec/lib/qwaiter/counter_spec.rb
new file mode 100644
index 00000000..25cabf73
--- /dev/null
+++ b/spec/lib/qwaiter/counter_spec.rb
@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Qwaiter::Counter do
+  describe 'couchbase connection' do
+    before do
+      @original_connection = Qwaiter::Counter.connection
+      Qwaiter::Counter.connection = $cb
+    end
+
+    after do
+      Qwaiter::Counter.connection = @original_connection
+    end
+
+    describe '.incr' do
+      it 'sets nonexistent keys to 1' do
+        expect( subject.incr 'nonexistent1' ).to eq 1
+        expect( subject.get 'nonexistent1' ).to eq 1
+      end
+    end
+  end
+
+  describe 'test connection' do
+    describe '.incr' do
+      it 'sets nonexistent keys to 1' do
+        expect( subject.incr 'nonexistent1' ).to eq 1
+        expect( subject.get 'nonexistent1' ).to eq 1
+      end
+    end
+  end
+end
diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb
index d583bea2..2f44fd1a 100644
--- a/spec/models/list_spec.rb
+++ b/spec/models/list_spec.rb
@@ -61,15 +61,15 @@ describe List do
     end
 
     it "changes the table" do
-      expect{ list.move_to_table! new_table }.to change{ list.table_id }.to( new_table.id ) 
+      expect{ list.move_to_table! new_table }.to change{ list.table_id }.to( new_table.id )
     end
 
     it "changes the section" do
-      expect{ list.move_to_table! new_table }.to change{ list.section_id }.to( new_section.id ) 
+      expect{ list.move_to_table! new_table }.to change{ list.section_id }.to( new_section.id )
     end
 
     it "changes the section of the orders" do
-      expect{ list.move_to_table! new_table }.to change{ @order1.reload; @order1.section_id }.to( new_section.id ) 
+      expect{ list.move_to_table! new_table }.to change{ @order1.reload; @order1.section_id }.to( new_section.id )
     end
   end
 
@@ -142,6 +142,7 @@ describe List do
 
     describe 'broadcasting' do
       it 'broadcasts to the user and the supplier the active order counter' do
+        # create existing order
         list.place_order(products: {product.id => 7}, user: user)
 
         expect{
diff --git a/spec/models/supplier_spec.rb b/spec/models/supplier_spec.rb
index da7a627f..9c896b0c 100644
--- a/spec/models/supplier_spec.rb
+++ b/spec/models/supplier_spec.rb
@@ -24,7 +24,7 @@ describe Supplier do
       Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 9
       supplier.orders_placed_count.should == 9
       Supplier.reset_counters!
-      sleep 0.5
+      sleep 1
       supplier.orders_placed_count.should == 0
       Qwaiter::Counter.connection = old_connection
     end
diff --git a/spec/support/in_memory_q_counter.rb b/spec/support/in_memory_q_counter.rb
index 10c45805..ff6b9597 100644
--- a/spec/support/in_memory_q_counter.rb
+++ b/spec/support/in_memory_q_counter.rb
@@ -18,13 +18,23 @@ class InMemoryQCounter
   end
 
   def incr(key, options = {})
-    store[key] ||= options[:initial].to_i
-    store[key] += 1
+    # store[key] ||= options[:initial].to_i
+    # store[key] += 1
+    if store[key]
+      store[key] += 1
+    else
+      store[key] = options[:initial].to_i
+    end
   end
 
   def decr(key, options = {})
-    store[key] ||= options[:initial].to_i
-    store[key] -= 1
+    # store[key] ||= options[:initial].to_i
+    # store[key] -= 1
+    if store[key]
+      store[key] -= 1
+    else
+      store[key] = options[:initial].to_i
+    end
   end
 
   def flush