diff --git a/lib/transport/messages.js b/lib/transport/messages.js
index 26bb39ec4..ff1ca14f9 100644
--- a/lib/transport/messages.js
+++ b/lib/transport/messages.js
@@ -153,7 +153,7 @@ function Version(subversion, nonce) {
   this.version = PROTOCOL_VERSION;
   this.subversion = subversion || '/BitcoinX:0.1/';
   this.nonce = nonce || CONNECTION_NONCE;
-};
+}
 util.inherits(Version, Message);
 
 Version.prototype.fromBuffer = function(payload) {
@@ -352,7 +352,7 @@ function Alert() {
 }
 util.inherits(Alert, Message);
 
-Alert.prototype.fromBuffer = function() {
+Alert.prototype.fromBuffer = function(payload) {
   var parser = new BufferReader(payload);
   this.payload = parser.readVarintBuf(); // TODO: Use current format
   this.signature = parser.readVarintBuf();
@@ -376,12 +376,12 @@ function Headers(blockheaders) {
 }
 util.inherits(Headers, Message);
 
-Headers.prototype.fromBuffer = function() {
+Headers.prototype.fromBuffer = function(payload) {
   var parser = new BufferReader(payload);
   var count = parser.readVarintNum();
 
   this.headers = [];
-  for (i = 0; i < count; i++) {
+  for (var i = 0; i < count; i++) {
     var header = Block().fromBufferReader(parser);
     this.headers.push(header);
   }
@@ -406,7 +406,7 @@ function Block(block) {
 }
 util.inherits(Block, Message);
 
-Block.prototype.fromBuffer = function() {
+Block.prototype.fromBuffer = function(payload) {
   var parser = new BufferReader(payload);
   this.block = Block().fromBufferReader(parser);
   return this;
@@ -429,7 +429,7 @@ function Transaction(transaction) {
 }
 util.inherits(Transaction, Message);
 
-Transaction.prototype.fromBuffer = function() {
+Transaction.prototype.fromBuffer = function(payload) {
   var parser = new BufferReader(payload);
   this.transaction = Transaction().fromBufferReader(parser);
   return this;
@@ -455,7 +455,7 @@ function GetBlocks(starts, stop) {
 }
 util.inherits(GetBlocks, Message);
 
-GetBlocks.prototype.fromBuffer = function() {
+GetBlocks.prototype.fromBuffer = function(payload) {
   var parser = new BufferReader(payload);
   this.version = parser.readUInt32LE();
 
diff --git a/test/transport/peer.js b/test/transport/peer.js
index 2f2336233..8a832c02c 100644
--- a/test/transport/peer.js
+++ b/test/transport/peer.js
@@ -8,10 +8,10 @@ var should = chai.should();
 var expect = chai.expect;
 
 var bitcore = require('../..');
-var Peer = bitcore.transport.Peer2;
+var Peer = bitcore.transport.Peer;
 var Networks = bitcore.Networks;
 
-describe.only('Peer2', function() {
+describe('Peer', function() {
 
   it('should be able to create instance', function() {
     var peer = new Peer('localhost');
@@ -64,10 +64,4 @@ describe.only('Peer2', function() {
 
     peer.should.equal(peer2);
   });
-
-  it('should create connection', function() {
-    var peer = new Peer('localhost').connect();
-  });
-
-
 });