diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
    "datapackage": "^0.8.2",
    "express": "^4.13.3",
    "font-awesome": "^4.4.0",
-    "goodtables": "git+https://github.com/akariv/goodtables-js.git",
+    "goodtables": "akariv/goodtables-js.git",
    "inflected": "^1.1.6",
    "isomorphic-fetch": "^2.2.0",
    "jquery": "^2.0.0",
@@ -51,11 +51,11 @@
    "marked": "^0.3.5",
    "nconf": "^0.8.2",
    "nunjucks": "^2.1.0",
-    "os-types": "~1.10.0",
-    "papaparse": "git+https://github.com/kravets-levko/PapaParse.git",
+    "os-types": "^1.14.0",
+    "papaparse": "kravets-levko/PapaParse.git",
    "request": "^2.65.0",
    "typeahead.js": "^0.11.1",
-    "typeahead.js-bootstrap-css": "git+https://github.com/bassjobsen/typeahead.js-bootstrap-css",
+    "typeahead.js-bootstrap-css": "bassjobsen/typeahead.js-bootstrap-css",
    "validator": "^4.2.1"
  },
  "devDependencies": {
@@ -75,7 +75,7 @@
    "gulp-watch": "^4.3.5",
    "jscs": "^2.5.0",
    "mocha": "^2.3.3",
-    "os-bootstrap": "git+https://github.com/openspending/os-bootstrap.git",
+    "os-bootstrap": "openspending/os-bootstrap.git",
    "resolve": "^1.1.6",
    "stringify": "^5.1.0",
    "vinyl-buffer": "^1.0.0",
diff --git a/tests/index.js b/tests/index.js
@@ -11,7 +11,7 @@ describe('Core', function() {

  it('Should be alive', function(done) {
    var browser = utils.app.browser;
-    browser.visit('/', function() {
+    browser.visit('http://localhost:5000/', function() {
      assert.ok(browser.success);
      done();
    });
diff --git a/tests/services.js b/tests/services.js
@@ -165,6 +165,7 @@ describe('Application services', function() {

          var fiscalPackage = dataPackage.createFiscalDataPackage(attributes,
            resources);
+          delete fiscalPackage.promise;

          assert.deepEqual(fiscalPackage,
            require('./data/example-package.json'));
diff --git a/tests/utils/app.js b/tests/utils/app.js
@@ -44,8 +44,6 @@ exports.start = function(done) {
    // Run the server
    start().then(function(app) {
      exports.app = app;
-      var port = app.get('port');
-      Browser.localhost('127.0.0.1', port);
      exports.browser = new Browser({
        maxWait: 5000
      });
diff --git a/tests/wizard.js b/tests/wizard.js
@@ -4,10 +4,11 @@ var assert = require('chai').assert;
 var config = require('../app/config');
 var utils = require('./utils');

-var exampleResourceUrl = 'http://localhost:' + config.get('app:port') +
+var exampleResourceUrl = 'http://localhost:5000' +
  '/example-resource.csv';
 var dataPackageTitle = 'Test Перевірка';
 var dataPackageSlug = 'test-perevirka';
+var BASE_URL = 'http://localhost:5000';

 describe('Wizard UI', function() {
  this.timeout(60000);
@@ -17,7 +18,7 @@ describe('Wizard UI', function() {

  it('Should open app page', function(done) {
    var browser = utils.app.browser;
-    browser.visit('/provide-data', function() {
+    browser.visit(BASE_URL + '/provide-data', function() {
      assert.ok(browser.success);
      browser.waitForDigest('#step1-wrapper', 100)
        .then(function() {