diff --git a/test/app.js b/test/app.js
index 52923be..291e7cb 100644
--- a/test/app.js
+++ b/test/app.js
@@ -7,6 +7,8 @@ var express = require('express')
   , routes = require('./routes');
 var async = require('async');
 var app = module.exports = express.createServer();
+var dbURL = 'mongodb://localhost/database';
+var db = require('mongoose').connect(dbURL);
 
 // Configuration
 
diff --git a/test/routes/session.js b/test/routes/session.js
index 7554f7a..ac45da5 100644
--- a/test/routes/session.js
+++ b/test/routes/session.js
@@ -1,12 +1,10 @@
 /*
- * Session Routes
- */
-
-var users = require('../data/users');
-var notLoggedIn = require('./middleware/not_logged_in');
+* Session Routes
+*/
+  var User = require('../data/models/user');
+  var notLoggedIn = require('./middleware/not_logged_in');
 
 module.exports = function(app) {
-
   app.dynamicHelpers({
     session: function(req, res) {
       return req.session;
@@ -15,21 +13,25 @@ module.exports = function(app) {
 
   app.get('/session/new', notLoggedIn, function(req, res) {
     res.render('session/new', {title: "Log in"});
-  });
-
-  app.post('/session', notLoggedIn, function(req, res) {
-    if (users[req.body.username] &&
-      users[req.body.username].password === req.body.password) {
-        req.session.user = users[req.body.username];
-        res.redirect('/users');
-      } else {
-        res.redirect('/session/new');
-      }
     });
 
-  app.del('/session', function(req, res, next) {
-    req.session.destroy();
-    res.redirect('/users');
+  app.post('/session', notLoggedIn, function(req, res) {
+    User.findOne({username: req.body.username, password: req.body.password},
+      function(err, user) {
+        if (err) {
+          return next(err);
+        }
+        if (user) {
+          req.session.user = user;
+          res.redirect('/users');
+          } else {
+          res.redirect('/session/new');
+          }
+      });
   });
 
+  app.del('/session', function(req, res, next) {
+      req.session.destroy();
+      res.redirect('/users');
+  });
 };
\ No newline at end of file
diff --git a/test/routes/users.js b/test/routes/users.js
index d44a0b4..86c805d 100644
--- a/test/routes/users.js
+++ b/test/routes/users.js
@@ -10,17 +10,30 @@ var maxUsersPerPage = 5;
 
 module.exports = function(app) {
 
-  app.get('/users', function(req, res,next){
-  var page = req.query.page && parseInt(req.query.page, 10) || 0;    
-    User.find({})
-    .sort('name', 1)
-    .skip(page * maxUsersPerPage)
-    .limit(maxUsersPerPage)
-    .exec(function(err, users) {
+  app.get('/users', function(req, res, next){
+    var page = req.query.page && parseInt(req.query.page, 10) || 0;
+    
+    User.count(function(err, count) {
       if (err) {
-        return next(err);
+      return next(err);
       }
-      res.render('users/index', {title: 'Users', users: users});
+      var lastPage = (page + 1) * maxUsersPerPage >= count;
+      
+      User.find({})
+      .sort('name')
+      .skip(page * maxUsersPerPage)
+      .limit(maxUsersPerPage)
+      .exec(function(err, users) {
+        if (err) {
+         return next(err);
+      }
+      res.render('users/index', {
+        title: 'Users',
+        users: users,
+        page: page,
+        lastPage: lastPage
+      });
+      });
     });
   });
 
@@ -33,19 +46,16 @@ module.exports = function(app) {
   });
 
   app.post('/users', notLoggedIn, function(req, res, next) {
-    User.findOne({username: req.body.username}, function(err, user) {
-      if (err) {
-        return next(err);
-      }
-      if (user) {
-        return res.send('Conflict', 409);
-      }
-      User.create(req.body, function(err) {
+    User.create(req.body, function(err) {
         if (err) {
-          return next(err);
+           if (err.code === 11000) {
+              res.send('Conflict', 409);
+        } else {
+          next(err);
         }
-        res.redirect('/users');
-      });
+        return;
+      }
+      res.redirect('/users');
     });
   });