diff --git a/test/bloomfilter.js b/test/bloomfilter.js
index 9a7194e..e7859f0 100644
--- a/test/bloomfilter.js
+++ b/test/bloomfilter.js
@@ -2,16 +2,76 @@
 
 var chai = require('chai');
 
+var assert = require('assert');
+var bitcore = require('bitcore');
 var Data = require('./data/messages');
 var P2P = require('../');
 var BloomFilter = P2P.BloomFilter;
 
+// convert a hex string to a bytes buffer
+function ParseHex(str) {
+  var result = [];
+  while (str.length >= 2) {
+    result.push(parseInt(str.substring(0, 2), 16));
+    str = str.substring(2, str.length);
+  }
+  var buf = new Buffer(result, 16);
+  return buf;
+}
 
 describe('BloomFilter', function() {
+
   it('BloomFilter#fromBuffer and toBuffer methods work', function() {
     var testPayload = Data.FILTERLOAD.payload;
     var filter = new BloomFilter.fromBuffer(new Buffer(testPayload, 'hex'));
     filter.toBuffer().toString('hex').should.equal(testPayload);
   });
 
+  // test data from: https://github.com/bitcoin/bitcoin/blob/master/src/test/bloom_tests.cpp
+
+  it('correctly serialize filter with public keys added', function() {
+
+    var privateKey = bitcore.PrivateKey.fromWIF('5Kg1gnAjaLfKiwhhPpGS3QfRg2m6awQvaj98JCZBZQ5SuS2F15C');
+    var publicKey = privateKey.toPublicKey();
+
+    var filter = BloomFilter.create(2, 0.001, 0, BloomFilter.BLOOM_UPDATE_ALL);
+    filter.insert(publicKey.toBuffer());
+    filter.insert(bitcore.crypto.Hash.sha256ripemd160(publicKey.toBuffer()));
+
+    var expectedFilter = BloomFilter.fromBuffer(ParseHex('038fc16b080000000000000001'));
+
+    filter.toBuffer().should.deep.equal(expectedFilter.toBuffer());
+
+  });
+
+  it('correctly serialize to a buffer', function() {
+
+    var filter = BloomFilter.create(3, 0.01, 0, BloomFilter.BLOOM_UPDATE_ALL);
+
+    filter.insert(ParseHex('99108ad8ed9bb6274d3980bab5a85c048f0950c8'));
+    assert(filter.contains(ParseHex('99108ad8ed9bb6274d3980bab5a85c048f0950c8')));
+    // one bit different in first byte
+    assert(!filter.contains(ParseHex('19108ad8ed9bb6274d3980bab5a85c048f0950c8')));
+    filter.insert(ParseHex('b5a2c786d9ef4658287ced5914b37a1b4aa32eee'));
+    assert(filter.contains(ParseHex("b5a2c786d9ef4658287ced5914b37a1b4aa32eee")));
+    filter.insert(ParseHex('b9300670b4c5366e95b2699e8b18bc75e5f729c5'));
+    assert(filter.contains(ParseHex('b9300670b4c5366e95b2699e8b18bc75e5f729c5')));
+
+    var actual = filter.toBuffer();
+    var expected = new Buffer('03614e9b050000000000000001', 'hex');
+
+    actual.should.deep.equal(expected);
+  });
+
+ it('correctly deserialize a buffer', function() {
+
+   var buffer = new Buffer('03614e9b050000000000000001', 'hex');
+   var filter = BloomFilter.fromBuffer(buffer);
+
+   assert(filter.contains(ParseHex('99108ad8ed9bb6274d3980bab5a85c048f0950c8')));
+   assert(!filter.contains(ParseHex('19108ad8ed9bb6274d3980bab5a85c048f0950c8')));
+   assert(filter.contains(ParseHex("b5a2c786d9ef4658287ced5914b37a1b4aa32eee")));
+   assert(filter.contains(ParseHex('b9300670b4c5366e95b2699e8b18bc75e5f729c5')));
+ });
+
 });