diff --git a/swarm/network/stream/stream.go b/swarm/network/stream/stream.go
index 6f17a9a8ec..e235fc7b1d 100644
--- a/swarm/network/stream/stream.go
+++ b/swarm/network/stream/stream.go
@@ -776,9 +776,9 @@ type StreamerPrices struct {
 }
 
 //Price implements the accounting interface and returns the price for a specific message
-func (spo *StreamerPrices) Price(msg interface{}) *protocols.Price {
-	typ := reflect.TypeOf(msg).Elem()
-	return spo.priceMatrix[typ]
+func (sp *StreamerPrices) Price(msg interface{}) *protocols.Price {
+	t := reflect.TypeOf(msg).Elem()
+	return sp.priceMatrix[t]
 }
 
 //createPriceOracle sets up a matrix which can be queried to get
@@ -789,12 +789,12 @@ func (r *Registry) createPriceOracle() {
 	}
 	po.priceMatrix = map[reflect.Type]*protocols.Price{
 		reflect.TypeOf(ChunkDeliveryMsgRetrieval{}): {
-			Value:   uint64(100),
+			Value:   uint64(1), //arbitrary price for now
 			PerByte: true,
 			Payer:   protocols.Receiver,
 		},
 		reflect.TypeOf(RetrieveRequestMsg{}): {
-			Value:   uint64(10),
+			Value:   uint64(1), //arbitrary price for now
 			PerByte: false,
 			Payer:   protocols.Sender,
 		},
diff --git a/swarm/swap_test.go b/swarm/swap_test.go
index 81d2d20f49..80d6255dd7 100644
--- a/swarm/swap_test.go
+++ b/swarm/swap_test.go
@@ -149,7 +149,6 @@ func TestSwapNetworkSymmetricFileUpload(t *testing.T) {
 		for _, node := range sim.NodeIDs() {
 			item, ok := sim.NodeItem(node, bucketKeySwarm)
 			if !ok {
-				log.Error("No swarm")
 				return errors.New("No swarm")
 			}
 			swarm := item.(*Swarm)
@@ -200,7 +199,7 @@ func TestSwapNetworkSymmetricFileUpload(t *testing.T) {
 	//but in inverted signs
 
 	//iterate the map
-	success := true
+	errorFound := false
 	for k, mapForK := range balancesMap {
 		//iterate the submap
 		for n, balanceKwithN := range mapForK {
@@ -211,11 +210,11 @@ func TestSwapNetworkSymmetricFileUpload(t *testing.T) {
 			//...check that they have the same balance in Abs terms and that it is not 0
 			if balanceKwithN+mapForSubK[k] != 0 && balanceKwithN != 0 {
 				log.Error(fmt.Sprintf("Expected balances to be a+b = 0 AND balance(a) != 0, but they are not, balance k with n:  %d, balance n with k: %d", balanceKwithN, mapForSubK[k]))
-				success = false
+				errorFound = true
 			}
 		}
 	}
-	if !success {
+	if errorFound {
 		t.Fatal("Expected balances to be symmetrical, but they were not")
 	}
 	log.Debug("test terminated")
@@ -325,7 +324,6 @@ func TestSwapNetworkAsymmetricFileUpload(t *testing.T) {
 		for _, node := range sim.NodeIDs() {
 			item, ok := sim.NodeItem(node, bucketKeySwarm)
 			if !ok {
-				log.Error("No swarm")
 				return errors.New("no swarm")
 			}
 			swarm := item.(*Swarm)
@@ -367,7 +365,7 @@ func TestSwapNetworkAsymmetricFileUpload(t *testing.T) {
 		Assuming that in this case, balances should be symmetric too	I
 	*/
 
-	success := true
+	errorsFound := false
 	for k, mapForK := range balancesMap {
 		for n, balanceKwithN := range mapForK {
 			mapForSubK := balancesMap[n]
@@ -375,12 +373,12 @@ func TestSwapNetworkAsymmetricFileUpload(t *testing.T) {
 			log.Trace(fmt.Sprintf("balance of %s with %s: %d", n.TerminalString(), k.TerminalString(), mapForSubK[k]))
 			if balanceKwithN+mapForSubK[k] != 0 && balanceKwithN != 0 {
 				log.Error(fmt.Sprintf("Expected balances to be a+b = 0 AND balance(a) != 0, but they are not, balance k with n: %d, balance n with k: %d", balanceKwithN, mapForSubK[k]))
-				success = false
+				errorsFound = true
 			}
 		}
 	}
 
-	if !success {
+	if errorsFound {
 		t.Fatal("Expected balances to be symmetrical, but they were not")
 	}
 	log.Debug("test terminated")