Index: geniuswebcore/test/geniusweb/opponentmodel/FrequencyOppModelTest.py
===================================================================
--- geniuswebcore/test/geniusweb/opponentmodel/FrequencyOppModelTest.py	(revision 87)
+++ geniuswebcore/test/geniusweb/opponentmodel/FrequencyOppModelTest.py	(revision 88)
@@ -1,23 +1,26 @@
-from unitpy.GeneralTests import GeneralTests
-from geniusweb.opponentmodel.FrequencyOpponentModel import FrequencyOpponentModel
-from geniusweb.issuevalue.DiscreteValue import DiscreteValue
-from unittest.mock import Mock
-from geniusweb.progress.Progress import Progress
-from geniusweb.actions.PartyId import PartyId
-from geniusweb.actions.Offer import Offer
 from decimal import Decimal
 from typing import Dict, List
+import unittest
+from unittest.mock import Mock
+
+from tudelft.utilities.immutablelist.Range import Range
+from unitpy.GeneralTests import GeneralTests
+
+from geniusweb.actions.Offer import Offer
+from geniusweb.actions.Offer import Offer
+from geniusweb.actions.PartyId import PartyId
+from geniusweb.issuevalue.Bid import Bid
+from geniusweb.issuevalue.DiscreteValue import DiscreteValue
+from geniusweb.issuevalue.DiscreteValueSet import DiscreteValueSet
+from geniusweb.issuevalue.Domain import Domain
+from geniusweb.issuevalue.NumberValue import NumberValue
+from geniusweb.issuevalue.NumberValueSet import NumberValueSet
+from geniusweb.issuevalue.Value import Value
 from geniusweb.issuevalue.ValueSet import ValueSet
-from geniusweb.issuevalue.DiscreteValueSet import DiscreteValueSet
-from geniusweb.issuevalue.NumberValueSet import NumberValueSet
-from geniusweb.issuevalue.Domain import Domain
-from geniusweb.issuevalue.Value import Value
-from geniusweb.issuevalue.NumberValue import NumberValue
-from geniusweb.issuevalue.Bid import Bid
-from geniusweb.actions.Offer import Offer
-import unittest
-from tudelft.utilities.immutablelist.Range import Range
+from geniusweb.opponentmodel.FrequencyOpponentModel import FrequencyOpponentModel
+from geniusweb.progress.Progress import Progress
 
-class FrequencyOppModelTest (unittest.TestCase, GeneralTests[FrequencyOpponentModel] ):
+
+class FrequencyOppModelTest (unittest.TestCase, GeneralTests[FrequencyOpponentModel]):
 	ISS1 = "issue1"
 	ISS2 = "issue2";
@@ -30,15 +33,15 @@
 	other = PartyId("other")
 	HALF = Decimal("0.5")
-	#list:List[List[Bid]]  = []
+	# list:List[List[Bid]]  = []
 
 	def setUp(self):
-		issues:Dict[str, ValueSet]  = {}
-		discretevalues1:List[DiscreteValue]  = []
+		issues:Dict[str, ValueSet] = {}
+		discretevalues1:List[DiscreteValue] = []
 		discretevalues1.append(self.I1V1);
 		discretevalues1.append(self.I1V2);
 		values1 = DiscreteValueSet(discretevalues1)
-		issues[self.ISS1]= values1
-		values2 = NumberValueSet(Range(Decimal(0),Decimal(10), Decimal("0.3")))
-		issues[self.ISS2]=values2
+		issues[self.ISS1] = values1
+		values2 = NumberValueSet(Range(Decimal(0), Decimal(10), Decimal("0.3")))
+		issues[self.ISS2] = values2
 		self.domain = Domain("test", issues)
 		self.domain2 = Domain("test2", issues)
@@ -50,21 +53,21 @@
 		discretevalues1.append(self.I1V2b)
 		values1 = DiscreteValueSet(discretevalues1)
-		issues[self.ISS1]= values1
-		values2 = NumberValueSet(Range(Decimal(0), Decimal(10),Decimal("0.3")))
-		issues[self.ISS2]= values2
+		issues[self.ISS1] = values1
+		values2 = NumberValueSet(Range(Decimal(0), Decimal(10), Decimal("0.3")))
+		issues[self.ISS2] = values2
 		self.domain3 = Domain("test", issues)
 
 		# all bids are for domain
-		issuevalues:Dict[str, Value]  = {}
-		issuevalues[self.ISS1]= self.I1V1
-		issuevalues[self.ISS2]=NumberValue(Decimal("1.2"))
+		issuevalues:Dict[str, Value] = {}
+		issuevalues[self.ISS1] = self.I1V1
+		issuevalues[self.ISS2] = NumberValue(Decimal("1.2"))
 		self.bid1 = Bid(issuevalues)
 
-		issuevalues[self.ISS1]= self.I1V1
-		issuevalues[self.ISS2]= NumberValue(Decimal("1.5"))
+		issuevalues[self.ISS1] = self.I1V1
+		issuevalues[self.ISS2] = NumberValue(Decimal("1.5"))
 		self.bid2 = Bid(issuevalues)
 
-		issuevalues[self.ISS1]= self.I1V2
-		issuevalues[self.ISS2]= NumberValue(Decimal("1.5"))
+		issuevalues[self.ISS1] = self.I1V2
+		issuevalues[self.ISS2] = NumberValue(Decimal("1.5"))
 		self.bid3 = Bid(issuevalues)
 
@@ -75,18 +78,18 @@
 		self.oppModel4 = self.oppModel3.WithAction(Offer(self.other, self.bid1), self.progress)
 
-	#Override
-	def getGeneralTestData(self) -> List[List[FrequencyOpponentModel]] :
+	# Override
+	def getGeneralTestData(self) -> List[List[FrequencyOpponentModel]]:
 		return [[self.oppModel1, self.oppModel1b],
-				[self.oppModel2], [self.oppModel3],	[self.oppModel4]]
+				[self.oppModel2], [self.oppModel3], 	[self.oppModel4]]
 
-	#Override
-	def getGeneralTestStrings(self)->List[str] :
+	# Override
+	def getGeneralTestStrings(self) -> List[str]:
 		return ["FrequencyOpponentModel\\[0,\\{issue.=\\{\\}, issue.=\\{\\}\\}\\]",
 				"FrequencyOpponentModel\\[0,\\{issue.=\\{\\}, issue.=\\{\\}\\}\\]",
 				"FrequencyOpponentModel\\[0,\\{issue.=\\{\\}, issue.=\\{\\}\\}\\]",
-				"FrequencyOpponentModel\\[1,\\{issue2=\\{1.2=1\\}, issue1=\\{\"i1v1\"=1\\}\\}\\]"]
+				"FrequencyOpponentModel\\[1,\\{issue.*, issue.*"]
 
-	def testsmokeTestNull(self) :
-		self.assertRaises(ValueError, lambda:FrequencyOpponentModel.create().With(None,None))
+	def testsmokeTestNull(self):
+		self.assertRaises(ValueError, lambda:FrequencyOpponentModel.create().With(None, None))
 
 	def testsmokeTest(self):
@@ -99,5 +102,5 @@
 		
 	def testEmptyModelPartialBid(self):
-		oppModel =FrequencyOpponentModel.create().With(self.domain, None)
+		oppModel = FrequencyOpponentModel.create().With(self.domain, None)
 		bid = Bid({})
 		self.assertEqual(1, oppModel.getUtility(bid))
@@ -105,31 +108,30 @@
 	def testPartialUtility(self):
 		freqs:Dict[str, Dict[Value, int]] = {}
-		freqs1:Dict[Value, int]  = {}
-		freqs2:Dict[Value, int]  = {}
+		freqs1:Dict[Value, int] = {}
+		freqs2:Dict[Value, int] = {}
 
-		freqs1[self.I1V1]= 2
-		freqs1[self.I1V2]= 0
-		freqs2[self.I2V1]= 1
-		freqs2[self.I2V2]= 1
+		freqs1[self.I1V1] = 2
+		freqs1[self.I1V2] = 0
+		freqs2[self.I2V1] = 1
+		freqs2[self.I2V2] = 1
 
-		freqs[self.ISS1]= freqs1
-		freqs[self.ISS2]= freqs2
+		freqs[self.ISS1] = freqs1
+		freqs[self.ISS2] = freqs2
 		total = Decimal(2)
 
-		oppModel = FrequencyOpponentModel(self.domain,	freqs, total,None)
+		oppModel = FrequencyOpponentModel(self.domain, 	freqs, total, None)
 
 		E = 0.0000001
-		self.assertAlmostEqual(0.5, oppModel.getUtility(Bid({self.ISS1: self.I1V1})), None,E)
+		self.assertAlmostEqual(0.5, oppModel.getUtility(Bid({self.ISS1: self.I1V1})), None, E)
 		self.assertAlmostEqual(0, oppModel.getUtility(Bid({self.ISS1: self.I1V2})))
 		self.assertAlmostEqual(0.25,
-				oppModel.getUtility(Bid({self.ISS2:self.I2V1})), None,E)
+				oppModel.getUtility(Bid({self.ISS2:self.I2V1})), None, E)
 		self.assertAlmostEqual(0.25, oppModel.getUtility(Bid({self.ISS2: self.I2V2})))
-
 
 	def testUpdate(self):
 		oppModel = self.oppModel1.WithAction(Offer(self.other, self.bid1),
 				self.progress);
-		self.assertEqual(1, oppModel.getUtility(self.bid1) )
-		self.assertEqual(0,oppModel.getUtility(self.bid3) )
+		self.assertEqual(1, oppModel.getUtility(self.bid1))
+		self.assertEqual(0, oppModel.getUtility(self.bid3))
 		# bid2 has 1 of 2 issue values same as bid1.
 		self.assertTrue(0.5, oppModel.getUtility(self.bid2))
@@ -156,6 +158,6 @@
 
 		values1:Dict[str, Value] = {}
-		values1[self.ISS1]= self.I1V1
-		values1[self.ISS2]= self.I2V1
+		values1[self.ISS1] = self.I1V1
+		values1[self.ISS2] = self.I2V1
 		offer1 = Offer(self.other, Bid(values1))
 
@@ -174,6 +176,6 @@
 
 		values2:Dict[str, Value] = {}
-		values2[self.ISS1]=self.I1V2
-		values2[self.ISS2]=self.I2V2
+		values2[self.ISS1] = self.I1V2
+		values2[self.ISS2] = self.I2V2
 		offer2 = Offer(self.other, Bid(values2))
 
@@ -186,5 +188,4 @@
 		self.assertEqual(1, oppmod.getCounts(self.ISS2)[self.I2V2])
 
-
 	def testStableName(self):
 		name = self.oppModel1.getName()
Index: geniuswebcore/test/geniusweb/simplerunner/BlockingQueueTest.py
===================================================================
--- geniuswebcore/test/geniusweb/simplerunner/BlockingQueueTest.py	(revision 87)
+++ geniuswebcore/test/geniusweb/simplerunner/BlockingQueueTest.py	(revision 88)
@@ -5,8 +5,8 @@
 
 
+class BlockingQueueTest(unittest.TestCase):
 
-class BlockingQueueTest(unittest.TestCase):
     def testSimple(self):
-        q=BlockingQueue[int](4)
+        q = BlockingQueue[int](4)
         self.assertEqual(0, q.size())
         q.put(1)
@@ -14,11 +14,11 @@
         q.put(3)
         self.assertEqual(3, q.size())
-        self.assertEqual(1,q.take())
-        self.assertEqual(2,q.take())
-        self.assertEqual(3,q.take())
+        self.assertEqual(1, q.take())
+        self.assertEqual(2, q.take())
+        self.assertEqual(3, q.take())
         self.assertEqual(0, q.size())
         
     def testThreading(self):
-        q=BlockingQueue[int](4)
+        q = BlockingQueue[int](4)
 
         def pushnumbers():
@@ -27,11 +27,10 @@
                 q.put(n)
         
-        t = Thread(target = pushnumbers)
+        t = Thread(target=pushnumbers)
         t.start()
         
         for n in range(4):
-            val=q.take()
+            val = q.take()
             print(val)
             self.assertEqual(n, val)
         
-        
Index: geniuswebcore/test/geniusweb/simplerunner/SessionRunnerE2ETest.py
===================================================================
--- geniuswebcore/test/geniusweb/simplerunner/SessionRunnerE2ETest.py	(revision 87)
+++ geniuswebcore/test/geniusweb/simplerunner/SessionRunnerE2ETest.py	(revision 88)
@@ -11,4 +11,5 @@
 from geniusweb.simplerunner.ClassPathConnectionFactory import ClassPathConnectionFactory
 from geniusweb.simplerunner.NegoRunner import NegoRunner
+from geniusweb.simplerunner.Runner import Runner
 
 
@@ -23,7 +24,7 @@
 	logger = Mock(ReportToLogger("test"))
 	filename:str
-	runner:NegoRunner
+	runner:Runner
 
-	params = ["test/resources/settings.json", 
+	params = ["test/resources/settings.json",
 # 				 "test/resources/settings2.json" ,          PARTIALORDERING NOT YET
  				 "test/resources/settingsbadprofile.json",
@@ -32,6 +33,4 @@
 # 				 "test/resources/tournament.json"			ALLPERMUTATIONSETTINGS NOT YET
 				 ]
-
-
 	
 	def testAll(self):
@@ -41,8 +40,8 @@
 		'''
 		for filename in self.params:
-			self.filename=filename
-			with self.subTest("before "+self.filename):
+			self.filename = filename
+			with self.subTest("before " + self.filename):
 				self.before()
-			with self.subTest("runMain"+self.filename):
+			with self.subTest("runMain" + self.filename):
 				self.runTestMainFunction()
 
@@ -50,12 +49,12 @@
 		print("Running from file " + self.filename)
 		serialized = Path(self.filename).read_text("utf-8")
-		settings=self.jackson.parse(json.loads(serialized), NegoSettings)
-		self.runner = NegoRunner(settings, ClassPathConnectionFactory(),
-				self.logger,self.TEST_RUNTIME)
+		settings = self.jackson.parse(json.loads(serialized), NegoSettings)
+		self.runner = Runner(settings, ClassPathConnectionFactory(),
+				self.logger, self.TEST_RUNTIME)
 			
-	def runTestMainFunction(self) :
+	def runTestMainFunction(self):
 		NegoRunner.main([self.filename])
 
-	def runTest(self) :
+	def runTest(self):
 		self.runner.run()
 		print("Final state:\n" + str(self.runner.getProtocol().getState()))
