diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go
index 714a7c4397..e07075b556 100644
--- a/p2p/testing/protocolsession.go
+++ b/p2p/testing/protocolsession.go
@@ -2,17 +2,17 @@ package testing
 
 import (
 	"fmt"
-	"time"
 	"sync"
-	
-	"github.com/ethereum/go-ethereum/p2p/adapters"
+	"time"
+
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/logger/glog"
+	"github.com/ethereum/go-ethereum/p2p/adapters"
 )
 
 type ProtocolSession struct {
 	TestNodeAdapter
-	Ids  []*adapters.NodeId
+	Ids []*adapters.NodeId
 }
 
 type TestMessenger interface {
@@ -57,11 +57,10 @@ type Disconnect struct {
 	Error error            // disconnect reason
 }
 
-
 func NewProtocolSession(na adapters.NodeAdapter, ids []*adapters.NodeId) *ProtocolSession {
-	ps := &ProtocolSession {
+	ps := &ProtocolSession{
 		TestNodeAdapter: na.(TestNodeAdapter),
-		Ids: ids,
+		Ids:             ids,
 	}
 	return ps
 }
@@ -133,7 +132,6 @@ func (self *ProtocolSession) expect(exp Expect) error {
 	// fatal upon encountering first exchange error
 }
 
-
 // TestExchange tests a series of exchanges againsts the session
 func (self *ProtocolSession) TestExchanges(exchanges ...Exchange) error {
 	// launch all triggers of this exchanges
diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go
index 7e2678581b..e0c280fda2 100644
--- a/p2p/testing/protocoltester.go
+++ b/p2p/testing/protocoltester.go
@@ -2,21 +2,21 @@ package testing
 
 import (
 	"testing"
-	
-	"github.com/ethereum/go-ethereum/p2p/adapters"
-	"github.com/ethereum/go-ethereum/p2p/simulations"
+
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/logger/glog"
+	"github.com/ethereum/go-ethereum/p2p/adapters"
+	"github.com/ethereum/go-ethereum/p2p/simulations"
 )
 
 type ProtocolTester struct {
 	*ProtocolSession
 	network *simulations.Network
-	na adapters.NodeAdapter
+	na      adapters.NodeAdapter
 }
 
 func NewProtocolTester(t *testing.T, id *adapters.NodeId, n int, run func(id adapters.NodeAdapter) adapters.ProtoCall) *ProtocolTester {
-	
+
 	simPipe := adapters.NewSimPipe
 	net := simulations.NewNetwork(&simulations.NetworkConfig{})
 	naf := func(conf *simulations.NodeConfig) adapters.NodeAdapter {
@@ -32,21 +32,21 @@ func NewProtocolTester(t *testing.T, id *adapters.NodeId, n int, run func(id ada
 	if err != nil {
 		panic(err.Error())
 	}
-	
+
 	//na := net.GetNode(id).Adapter()
 	na := net.GetNodeAdapter(id)
-	
+
 	ids := adapters.RandomNodeIds(n)
-	
+
 	ps := NewProtocolSession(na, ids)
 	self := &ProtocolTester{
 		ProtocolSession: ps,
-		network: net,
-		na: na,
+		network:         net,
+		na:              na,
 	}
-	
+
 	self.Connect(ids...)
-	
+
 	return self
 }
 
diff --git a/swarm/network/discovery_test.go b/swarm/network/discovery_test.go
index a53a20052e..7187596685 100644
--- a/swarm/network/discovery_test.go
+++ b/swarm/network/discovery_test.go
@@ -38,7 +38,7 @@ func TestDiscovery(t *testing.T) {
 			p2ptest.Expect{
 				Code: 3,
 				Msg:  &SubPeersMsg{ProxLimit: 0, MinProxBinSize: 8},
-				Peer: s.ExchangeSession.Ids[0],
+				Peer: s.ProtocolTester.Ids[0],
 			},
 		},
 	})
diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go
index a150b1ee29..e26146cb39 100644
--- a/swarm/network/protocol_test.go
+++ b/swarm/network/protocol_test.go
@@ -59,14 +59,14 @@ func newBzzBaseTester(t *testing.T, n int, addr *peerAddr, ct *protocols.CodeMap
 	}
 
 	return &bzzTester{
-		addr:            addr,
-		ExchangeSession: s,
-		cs:              cs,
+		addr:           addr,
+		ProtocolTester: s,
+		cs:             cs,
 	}
 }
 
 type bzzTester struct {
-	*p2ptest.ExchangeSession
+	*p2ptest.ProtocolTester
 	addr *peerAddr
 	cs   map[string]chan bool
 }
diff --git a/swarm/network/pss.go b/swarm/network/pss.go
new file mode 100644
index 0000000000..87f506caba
--- /dev/null
+++ b/swarm/network/pss.go
@@ -0,0 +1,26 @@
+package network
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/logger"
+	"github.com/ethereum/go-ethereum/logger/glog"
+)
+
+type pssPeer struct {
+	Peer
+}
+
+type PssMsg struct {
+	Recipient pssPeer
+	Payload   []byte
+}
+
+func (pm *PssMsg) String() string {
+	return fmt.Sprintf("PssMsg: Recipient: %v", pm.Recipient)
+}
+
+func PssMsgHandler(msg interface{}) error {
+	glog.V(logger.Detail).Infof("Pss Handled!")
+	return nil
+}
diff --git a/swarm/network/pss_test.go b/swarm/network/pss_test.go
new file mode 100644
index 0000000000..5b772c9e8f
--- /dev/null
+++ b/swarm/network/pss_test.go
@@ -0,0 +1,67 @@
+package network
+
+import (
+	"testing"
+
+	"github.com/ethereum/go-ethereum/logger"
+	"github.com/ethereum/go-ethereum/logger/glog"
+	"github.com/ethereum/go-ethereum/p2p/adapters"
+	"github.com/ethereum/go-ethereum/p2p/simulations"
+	p2ptest "github.com/ethereum/go-ethereum/p2p/testing"
+)
+
+type pssTester struct {
+	*p2ptest.ProtocolTester
+}
+
+func TestPssTwoToSelf(t *testing.T) {
+	addr := RandomAddr()
+	pt := newPssTester(t, addr, 2)
+	hs_pivot := correctBzzHandshake(addr)
+	for _, id := range pt.Ids {
+		hs_sim := correctBzzHandshake(NewPeerAddrFromNodeId(id))
+		glog.V(logger.Detail).Infof("Will handshake %v with %v", hs_pivot, hs_sim)
+		<-pt.GetPeer(id).Connc
+		pt.TestExchanges(bzzHandshakeExchange(hs_pivot, hs_sim, id)...)
+	}
+}
+
+func newPssTester(t *testing.T, addr *peerAddr, n int) *pssTester {
+	return newPssBaseTester(t, addr, n)
+}
+
+func newPssBaseTester(t *testing.T, addr *peerAddr, n int) *pssTester {
+	ct := BzzCodeMap()
+	ct.Register(&PssMsg{})
+
+	simPipe := adapters.NewSimPipe
+	kp := NewKadParams()
+	to := NewKademlia(addr.OverlayAddr(), kp)
+	pp := NewHive(NewHiveParams(), to)
+	net := simulations.NewNetwork(&simulations.NetworkConfig{})
+	naf := func(conf *simulations.NodeConfig) adapters.NodeAdapter {
+		na := adapters.NewSimNode(conf.Id, net, simPipe)
+		return na
+	}
+	net.SetNaf(naf)
+
+	srv := func(p Peer) error {
+		p.Register(&PssMsg{}, PssMsgHandler)
+		pp.Add(p)
+		p.DisconnectHook(func(err error) {
+			pp.Remove(p)
+		})
+		return nil
+	}
+	protocall := func(na adapters.NodeAdapter) adapters.ProtoCall {
+		protocol := Bzz(addr.OverlayAddr(), na, ct, srv, nil, nil)
+		return protocol.Run
+	}
+
+	s := p2ptest.NewProtocolTester(t, NodeId(addr), n, protocall)
+
+	return &pssTester{
+		ProtocolTester: s,
+	}
+
+}