diff --git a/web/app/controllers/clients_controller.rb b/web/app/controllers/clients_controller.rb
index 65accb87c..928715adf 100644
--- a/web/app/controllers/clients_controller.rb
+++ b/web/app/controllers/clients_controller.rb
@@ -20,7 +20,6 @@ class ClientsController < ApplicationController
   end
 
   def latency_tester
-    gon_properties
     render :layout => 'client'
   end
 
@@ -38,33 +37,4 @@ class ClientsController < ApplicationController
       redirect_to client_url
     end
   end
-<<<<<<< HEAD
-=======
-
-  private
-
-  def gon_properties
-    # use gon to pass variables into javascript
-    gon.websocket_gateway_uri = Rails.application.config.websocket_gateway_uri
-    gon.websocket_gateway_trusted_uri = Rails.application.config.websocket_gateway_trusted_uri
-    gon.check_for_client_updates = Rails.application.config.check_for_client_updates
-    gon.fp_apikey = Rails.application.config.filepicker_rails.api_key
-    gon.fp_upload_dir = Rails.application.config.filepicker_upload_dir
-    gon.allow_force_native_client = Rails.application.config.allow_force_native_client
-    gon.ftue_io_wait_time = Rails.application.config.ftue_io_wait_time
-    gon.ftue_packet_rate_treshold = Rails.application.config.ftue_packet_rate_treshold
-    gon.ftue_network_test_duration = Rails.application.config.ftue_network_test_duration
-    gon.ftue_network_test_max_clients = Rails.application.config.ftue_network_test_max_clients
-    gon.ftue_maximum_gear_latency = Rails.application.config.ftue_maximum_gear_latency
-
-    # is this the native client or browser?
-    @nativeClient = is_native_client?
-
-    # let javascript have access to the server's opinion if this is a native client
-    gon.isNativeClient = @nativeClient
-
-    gon.use_cached_session_scores = Rails.application.config.use_cached_session_scores
-    gon.allow_both_find_algos = Rails.application.config.allow_both_find_algos
-  end
->>>>>>> * wip
 end
diff --git a/web/app/helpers/client_helper.rb b/web/app/helpers/client_helper.rb
index f70eddec9..f8f52caf6 100644
--- a/web/app/helpers/client_helper.rb
+++ b/web/app/helpers/client_helper.rb
@@ -43,6 +43,10 @@ module ClientHelper
     gon.fp_upload_dir = Rails.application.config.filepicker_upload_dir
     gon.allow_force_native_client = Rails.application.config.allow_force_native_client
     gon.ftue_io_wait_time = Rails.application.config.ftue_io_wait_time
+    gon.ftue_packet_rate_treshold = Rails.application.config.ftue_packet_rate_treshold
+    gon.ftue_network_test_duration = Rails.application.config.ftue_network_test_duration
+    gon.ftue_network_test_max_clients = Rails.application.config.ftue_network_test_max_clients
+    gon.ftue_maximum_gear_latency = Rails.application.config.ftue_maximum_gear_latency
 
     # is this the native client or browser?
     @nativeClient = is_native_client?
diff --git a/websocket-gateway/spec/jam_websockets/router_spec.rb b/websocket-gateway/spec/jam_websockets/router_spec.rb
index 092cd9dbe..6d1743265 100644
--- a/websocket-gateway/spec/jam_websockets/router_spec.rb
+++ b/websocket-gateway/spec/jam_websockets/router_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'thread'
 
 LoginClient = Class.new do
-  attr_accessor :onmsgblock, :onopenblock, :encode_json, :channel_id, :client_id, :user_id, :context
+  attr_accessor :onmsgblock, :onopenblock, :encode_json, :channel_id, :client_id, :user_id, :context, :trusted
 
 
   def initialize()
@@ -149,8 +149,9 @@ describe Router do
         client.should_receive(:onerror)
         client.should_receive(:onmessage)
         client.should_receive(:encode_json=)
+        client.should_receive(:trusted=)
 
-        @router.new_client(client)
+        @router.new_client(client, false)
         done
       #end
     end