diff --git a/lib/BlockDb.js b/lib/BlockDb.js
index 67eada86..d53fa4b6 100644
--- a/lib/BlockDb.js
+++ b/lib/BlockDb.js
@@ -44,7 +44,7 @@ function spec() {
 
 
     var time_key = TIMESTAMP_ROOT +
-      ( b.timestamp || Math.round(new Date().getTime() / 1000) );
+      ( b.time || Math.round(new Date().getTime() / 1000) );
 
     self.db.batch()
       .put(time_key, b.hash)
diff --git a/lib/HistoricSync.js b/lib/HistoricSync.js
index b0b541d9..6b547bc3 100644
--- a/lib/HistoricSync.js
+++ b/lib/HistoricSync.js
@@ -131,7 +131,7 @@ function spec() {
     async.series([
     // Already got it?
     function(c) {
-      self.sync.blockDb.has(blockHash, function(err, ret) {
+      self.sync.bDb.has(blockHash, function(err, ret) {
         if (err) {
           p(err);
           return c(err);
@@ -317,7 +317,7 @@ function spec() {
     function(c) {
       if (!blockInfo) return c();
 
-      self.sync.blockDb.has(blockInfo.hash, function(err, had) {
+      self.sync.bDb.has(blockInfo.hash, function(err, had) {
         existed = had;
         return c(err);
       });
@@ -357,7 +357,7 @@ function spec() {
     if (self.notOrphanCount) return cb(null, self.notOrphanCount);
 
 
-    self.sync.blockDb.countNotOrphan(function(err, count) {
+    self.sync.bDb.countNotOrphan(function(err, count) {
       if (err) return cb(err);
       self.notOrphanCount = count;
       return cb(null, self.notOrphanCount);
@@ -480,7 +480,7 @@ function spec() {
   HistoricSync.prototype.smartImport = function(scanOpts, next) {
     var self = this;
 
-    self.sync.blockDb.has(self.genesis, function(err, b) {
+    self.sync.bDb.has(self.genesis, function(err, b) {
       if (err) return next(err);
       self.countNotOrphan(function(err, count) {
         if (err) return next(err);
diff --git a/test/integration/blocklist.js b/test/integration/blocklist.js
index 8225a173..bc18dbaf 100644
--- a/test/integration/blocklist.js
+++ b/test/integration/blocklist.js
@@ -3,24 +3,37 @@
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-var TESTING_BLOCK = '000000001f56660def9b5898ea8411d7b028854e78502e521f9ebd53e673751c';
-var START_TS = '1391607675';
-var END_TS = '1391607709';
+var TESTING_BLOCK0 = '000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943';
+var TESTING_BLOCK1 = '00000000b873e79784647a6c82962c70d228557d24a747ea4d1b8bbe878e1206';
+var START_TS  = 1293895128; // 1/1/2011
+var END_TS    = 1296688428; // 2/2/2011 23:23PM
 
-var
-  assert  = require('assert'),
-  config      = require('../../config/config'),
+var assert  = require('assert'),
   BlockDb     = require('../../lib/BlockDb').class();
 
-describe('BlockDb getHashes', function(){
+var bDb;
+
+describe('BlockDb getBlocksByDate', function(){
+
+
+  before(function(c) {
+    bDb = new BlockDb();
+    return c();
+  });
+
+
+  after(function(c) {
+    bDb.close(c);
+  });
 
-  var bdb = new BlockDb();
   it('Get Hash by Date', function(done) {
 
-    bdb.getBlocksByDate(START_TS, END_TS, function(err, list) {
+    bDb.getBlocksByDate(START_TS, END_TS, function(err, list) {
       if (err) done(err);
-      assert.equal(list[0].ts, START_TS);
-      assert.equal(list[0].hash, TESTING_BLOCK);
+      assert(list, 'returns list');
+      assert.equal(list.length,2, 'list has 2 items');
+      assert.equal(list[0].hash, TESTING_BLOCK0);
+      assert.equal(list[1].hash, TESTING_BLOCK1);
       done();
     });
   });