diff --git a/api/controllers/todoListController.js b/api/controllers/todoListController.js
index f267eef..8ea82d9 100644
--- a/api/controllers/todoListController.js
+++ b/api/controllers/todoListController.js
@@ -32,13 +32,13 @@ exports.read_a_task = function(req, res) {
 };
 
 exports.update_a_task = function(req, res) {
-  Task.findOneAndUpdate(req.params.taskId, req.body, {new: true}, function(err, task) {
+  Task.findOneAndUpdate({ _id: req.params.taskId }, req.body, { new: true }, function(err, task) {
     if (err)
       res.send(err);
     res.json(task);
   });
 };
-// Task.remove({}).exec(function(){});
+
 exports.delete_a_task = function(req, res) {
 
   Task.remove({
diff --git a/config/development.js b/config/development.js
new file mode 100644
index 0000000..4cf8123
--- /dev/null
+++ b/config/development.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = {
+  env: 'development',
+  db: 'mongodb://localhost/Tododb',
+  port: process.env.PORT || 4000,
+};
\ No newline at end of file
diff --git a/config/index.js b/config/index.js
new file mode 100644
index 0000000..d9f9649
--- /dev/null
+++ b/config/index.js
@@ -0,0 +1,7 @@
+'use strict';
+
+var env = process.env.NODE_ENV || 'development';
+var config = require(`./${env}`);
+
+
+module.exports = config;
diff --git a/config/production.js b/config/production.js
new file mode 100644
index 0000000..4e40685
--- /dev/null
+++ b/config/production.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = {
+  env: 'production',
+  db: process.env.MONGOHQ_URL || process.env.MONGODB_URI,
+  port: process.env.PORT || 4000,
+};
\ No newline at end of file
diff --git a/config/test.js b/config/test.js
new file mode 100644
index 0000000..71a14bc
--- /dev/null
+++ b/config/test.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = {
+  env: 'test',
+  db: 'mongodb://localhost/TododbTest',
+  port: process.env.PORT || 4100,
+};
diff --git a/package.json b/package.json
index f9032a9..84e2261 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
   "description": "RESTful todoListApi",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "NODE_ENV=test mocha --timeout 10000",
+    "test-coverage": "NODE_ENV=test istanbul cover _mocha -- -R spec",
     "start": "nodemon server.js"
   },
   "repository": {
@@ -23,7 +24,13 @@
   },
   "homepage": "https://github.com/generalgmt/RESTfulAPITutorial#readme",
   "devDependencies": {
-    "nodemon": "^1.11.0"
+    "chai": "^3.5.0",
+    "install": "^0.8.8",
+    "istanbul": "^0.4.5",
+    "mocha": "^3.2.0",
+    "nodemon": "^1.11.0",
+    "npm": "^4.4.4",
+    "supertest": "^3.0.0"
   },
   "dependencies": {
     "body-parser": "^1.15.2",
diff --git a/server.js b/server.js
index b0bbb57..09933f8 100644
--- a/server.js
+++ b/server.js
@@ -1,12 +1,15 @@
+'use strict';
+
 var express = require('express'),
   app = express(),
   port = process.env.PORT || 3000,
   mongoose = require('mongoose'),
   Task = require('./api/models/todoListModel'),
+  config = require('./config/index'),
   bodyParser = require('body-parser');
 
 mongoose.Promise = global.Promise;
-mongoose.connect('mongodb://localhost/Tododb');
+mongoose.connect(config.db);
 
 
 app.use(bodyParser.urlencoded({ extended: true }));
@@ -20,6 +23,8 @@ app.use(function(req, res) {
   res.status(404).send({url: req.originalUrl + ' not found'})
 });
 
-app.listen(port);
+app.listen(config.port);
+
+console.log('todo list RESTful API server started on: ' + config.port);
 
-console.log('todo list RESTful API server started on: ' + port);
+module.exports = app;
\ No newline at end of file
diff --git a/test/todos.test.js b/test/todos.test.js
new file mode 100644
index 0000000..bc72caf
--- /dev/null
+++ b/test/todos.test.js
@@ -0,0 +1,75 @@
+'use strict';
+
+var app = require('../server');
+var chai = require('chai');
+var request = require('supertest');
+
+var expect = chai.expect;
+
+describe('API Tests', function() {
+  var task = {
+    name: 'integration test',
+  };
+
+  describe('## Create task ', function() {
+    it('should create a task', function(done) {
+      request(app)
+        .post('/tasks')
+        .send(task)
+        .end(function(err, res) {
+          expect(res.statusCode).to.equal(200);
+          expect(res.body.name).to.equal('integration test');
+          task = res.body;
+          done();
+        });
+    });
+  });
+
+  describe('# Get all tasks', function() {
+    it('should get all tasks', function(done) {
+      request(app)
+        .get('/tasks')
+        .end(function(err, res) {
+          expect(res.statusCode).to.equal(200);
+          expect(res.body).to.be.an('array');
+          done();
+        });
+    });
+  });
+  describe('Get a task by id', function() {
+    it('should get a task', function(done) {
+      request(app)
+        .get('/tasks/' + task._id)
+        .end(function(err, res) {
+          expect(res.statusCode).to.equal(200);
+          expect(res.body.name).to.equal('integration test');
+          done();
+        });
+    });
+  });
+
+  describe('Update a task by id', function() {
+    it('should modify a task', function(done) {
+      task.name = 'New Task'
+      request(app)
+        .put('/tasks/' + task._id)
+        .send(task)
+        .end(function(err, res) {
+          expect(res.body.name).to.equal('New Task');
+          expect(res.statusCode).to.equal(200);
+          done();
+        });
+    });
+  });
+  describe('Delete a task by id', function() {
+    it('should delete a task', function(done) {
+      request(app)
+        .delete('/tasks/' + task._id)
+        .end(function(err, res) {
+          expect(res.statusCode).to.equal(200);
+          expect(res.body.message).to.equal('Task successfully deleted');
+          done();
+        });
+    });
+  });
+});