diff --git a/lib/workers/gh.js b/lib/workers/gh.js
index 7952119..90add63 100644
--- a/lib/workers/gh.js
+++ b/lib/workers/gh.js
@@ -1,6 +1,6 @@
 // Generated by IcedCoffeeScript 1.8.0-c
 (function() {
-  var Promise, auth, emptyResolve, get_gh_role, get_gh_team_id, get_gh_team_ids, get_gh_username, get_or_create_asset, gh, git, handle_add_gh_rsrc_role, handle_add_repo, handle_add_user, handle_create_team, handle_deactivate_user, handle_remove_gh_rsrc_role, handle_remove_repo, handle_remove_user, has_gh_team_membership_through_other_role, teams_api, users, _,
+  var Promise, auth, emptyResolve, get_gh_role, get_gh_team_id, get_gh_team_ids, get_gh_username, get_or_create_asset, gh, git, handle_add_gh_rsrc_role, handle_add_repo, handle_add_user, handle_create_team, handle_deactivate_user, handle_remove_gh_rsrc_role, handle_remove_repo, handle_remove_user, has_gh_team_membership_through_other_role, users, _,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   _ = require('underscore');
@@ -13,8 +13,6 @@
 
   Promise = require('pantheon-helpers').promise;
 
-  teams_api = require('../api/teams');
-
   gh = {};
 
   emptyResolve = function() {
@@ -160,6 +158,8 @@
   };
 
   get_gh_team_ids = function(user) {
+    var teams_api;
+    teams_api = require('../api/teams');
     return teams_api.get_all_team_roles_for_user(user.name).then(function(team_roles) {
       var gh_team_ids;
       gh_team_ids = team_roles.map(function(team_role) {
diff --git a/lib/workers/moirai.js b/lib/workers/moirai.js
index 333d9d0..c3d036b 100644
--- a/lib/workers/moirai.js
+++ b/lib/workers/moirai.js
@@ -1,13 +1,11 @@
 // Generated by IcedCoffeeScript 1.8.0-c
 (function() {
-  var Promise, auth, conf, emptyResolve, getOrCreateAsset, getTeamAssetDetails, handleAddCluster, handleAddData, handleAddUser, handleRemoveCluster, handleRemoveUser, moirai, moiraiConf, querystring, slug, teams, users, _;
+  var Promise, auth, conf, emptyResolve, getOrCreateAsset, getTeamAssetDetails, handleAddCluster, handleAddData, handleAddUser, handleRemoveCluster, handleRemoveUser, moirai, moiraiConf, querystring, slug, users, _;
 
   _ = require('underscore');
 
   users = require('../api/users');
 
-  teams = require('../api/teams');
-
   auth = require('../validation').auth;
 
   Promise = require('pantheon-helpers/lib/promise');
@@ -103,7 +101,9 @@
   };
 
   handleAddData = function(event, user) {
+    var teams;
     if (event.data.publicKeys != null) {
+      teams = require('../api/teams');
       return teams.get_all_team_roles_for_user(user.name).then(function(teamList) {
         var teamPromises;
         teamPromises = teamList.map(function(teamHash) {
diff --git a/spec/workers/moiraiSpec.coffee b/spec/workers/moiraiSpec.coffee
index c83f925..daf0407 100644
--- a/spec/workers/moiraiSpec.coffee
+++ b/spec/workers/moiraiSpec.coffee
@@ -214,7 +214,7 @@ describe 'handleAddData', () ->
     this.event = {data: {publicKeys: ['key']}}
     this.user = {name: 'user_name'}
 
-  xit 'calls get_all_team_roles_for_user', (done) ->
+  it 'calls get_all_team_roles_for_user', (done) ->
     handleAddData = moirai.handlers.user['d+']
     handleAddData(this.event, this.user).then((resp) ->
       expect(teams.get_all_team_roles_for_user.calls.length).toEqual(1)
@@ -223,7 +223,7 @@ describe 'handleAddData', () ->
       done()
     ).catch(onError)
 
-  xit 'calls setTeamKeys', (done) ->
+  it 'calls setTeamKeys', (done) ->
     handleAddData = moirai.handlers.user['d+']
     handleAddData(this.event, this.user).then((resp) ->
       expect(moirai.testing.setTeamKeys.calls.length).toEqual(2)
diff --git a/src/workers/gh.coffee b/src/workers/gh.coffee
index 6a13d55..d344b7a 100644
--- a/src/workers/gh.coffee
+++ b/src/workers/gh.coffee
@@ -3,7 +3,6 @@ users = require('../api/users')
 auth = require('../validation').auth
 git = require('./gh_client')
 Promise = require('pantheon-helpers').promise
-teams_api = require('../api/teams')
 
 gh = {}
 
@@ -107,6 +106,7 @@ handle_create_team = (event, team) ->
   )
 
 get_gh_team_ids = (user) ->
+  teams_api = require('../api/teams')
   teams_api.get_all_team_roles_for_user(user.name).then((team_roles) ->
     gh_team_ids = team_roles.map((team_role) ->
       return get_gh_team_id(team_role.team, user, team_role.role)
diff --git a/src/workers/moirai.coffee b/src/workers/moirai.coffee
index 9f9f7b0..ef1b901 100644
--- a/src/workers/moirai.coffee
+++ b/src/workers/moirai.coffee
@@ -1,6 +1,5 @@
 _ = require('underscore')
 users = require('../api/users')
-teams = require('../api/teams')
 auth = require('../validation').auth
 Promise = require('pantheon-helpers/lib/promise')
 conf = require('../config')
@@ -69,6 +68,7 @@ handleAddCluster = (event, team) ->
 handleAddData = (event, user) ->
   # look at the event, see if one of the keys in the event is publicKeys
   if event.data.publicKeys?
+    teams = require('../api/teams')
     return teams.get_all_team_roles_for_user(user.name).then((teamList) ->
       teamPromises = teamList.map((teamHash) ->
         team = teamHash.team