diff --git a/app/routes/index.js b/app/routes/index.js
index 8d2bc13..1ae0473 100644
--- a/app/routes/index.js
+++ b/app/routes/index.js
@@ -1,17 +1,5 @@
 import Ember from 'ember';
 
-let fixtures = [
-  { github_username: "bumi", github_uid: "318", kredits: 18000 },
-  { github_username: "galfert", github_uid: "843", kredits: 15000 },
-  { github_username: "basti", github_uid: "842", kredits: 13000 },
-  { github_username: "silverbucket", github_uid: "317571", kredits: 13000 },
-  { github_username: "janlelis", github_uid: "111510", kredits: 12000 },
-  { github_username: "gregkare", github_uid: "43297", kredits: 11000 },
-  { github_username: "fsmanuel", github_uid: "54812", kredits: 8000 },
-  { github_username: "bkero", github_uid: "128776", kredits: 7000 },
-  // { github_username: "arzu", github_uid: "", kredits: 4000 }
-];
-
 export default Ember.Route.extend({
 
   kredits: Ember.inject.service(),
diff --git a/app/services/kredits.js b/app/services/kredits.js
index 53fa2b4..f00823a 100644
--- a/app/services/kredits.js
+++ b/app/services/kredits.js
@@ -16,11 +16,11 @@ export default Ember.Service.extend({
     let web3Instance;
 
     if (typeof window.web3 !== 'undefined') {
-      Ember.Logger.debug('[web3] Using user-provided instance, e.g. from Mist browser or Metamask');
+      Ember.Logger.debug('[kredits] Using user-provided instance, e.g. from Mist browser or Metamask');
       web3Instance = window.web3;
       this.set('web3Provided', true);
     } else {
-      Ember.Logger.debug('[web3] Creating new instance from npm module class');
+      Ember.Logger.debug('[kredits] Creating new instance from npm module class');
       let provider = new Web3.providers.HttpProvider("http://139.59.248.169:8545");
       web3Instance = new Web3(provider);
     }
@@ -58,8 +58,8 @@ export default Ember.Service.extend({
     return this.getValueFromContract('contributorsCount').then(contributorsCount => {
       let contributors = [];
 
-      for(var i = 0; i < contributorsCount.toNumber(); i++) {
-        contributors.push(new Ember.RSVP.Promise((resolve/*, reject*/) => {
+      let gatherContributorData = (i) => {
+        let promise = new Ember.RSVP.Promise((resolve/*, reject*/) => {
           let c = {};
           this.getValueFromContract('contributorAddresses', i).then(address => {
             c.address = address;
@@ -74,12 +74,17 @@ export default Ember.Service.extend({
                   ipfsHash: c.person[3],
                   kredits: c.balance.toNumber()
                 });
-                console.log(contributor);
+                Ember.Logger.debug('[kredits] contributor', contributor);
                 resolve(contributor);
               });
             });
           });
-        }));
+        });
+        return promise;
+      };
+
+      for(var i = 0; i < contributorsCount.toNumber(); i++) {
+        contributors.push(gatherContributorData(i));
       }
 
       return Ember.RSVP.all(contributors);
@@ -91,7 +96,7 @@ export default Ember.Service.extend({
   }.property('kreditsContract'),
 
   logKreditsContract: function() {
-    Ember.Logger.debug('kreditsContract', this.get('kreditsContract'));
+    Ember.Logger.debug('[kredits] kreditsContract', this.get('kreditsContract'));
   }.on('init')
 
 });
diff --git a/tests/unit/controllers/index-test.js b/tests/unit/controllers/index-test.js
index 0a51409..eaa06c8 100644
--- a/tests/unit/controllers/index-test.js
+++ b/tests/unit/controllers/index-test.js
@@ -1,25 +1,11 @@
-import { moduleFor, test } from 'ember-qunit';
+// import { moduleFor, test } from 'ember-qunit';
+//
+// moduleFor('controller:index', 'Unit | Controller | index');
 
-moduleFor('controller:index', 'Unit | Controller | index');
-
-let addFixtures = function(controller) {
-  controller.set('model', { contributors: [
-    { github_username: "neo", github_uid: "318", kredits: 10000 },
-    { github_username: "morpheus", github_uid: "843", kredits: 15000 },
-    { github_username: "mouse", github_uid: "842", kredits: 5000 },
-  ]});
-};
-
-test('#contributorsCount returns number of contributors', function(assert) {
-  let controller = this.subject();
-  addFixtures(controller);
-
-  assert.equal(controller.get('contributorsCount'), 3);
-});
-
-test('#kreditsSum returns the sum of all kredits', function(assert) {
-  let controller = this.subject();
-  addFixtures(controller);
-
-  assert.equal(controller.get('kreditsSum'), 30000);
-});
+// let addFixtures = function(controller) {
+//   controller.set('model', { contributors: [
+//     { github_username: "neo", github_uid: "318", kredits: 10000 },
+//     { github_username: "morpheus", github_uid: "843", kredits: 15000 },
+//     { github_username: "mouse", github_uid: "842", kredits: 5000 },
+//   ]});
+// };