Index: boa/src/test/java/geniusweb/boa/BoaPartyTest.java
===================================================================
--- boa/src/test/java/geniusweb/boa/BoaPartyTest.java	(revision 32)
+++ boa/src/test/java/geniusweb/boa/BoaPartyTest.java	(revision 33)
@@ -6,4 +6,6 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -13,4 +15,5 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.logging.Level;
 
 import org.junit.Test;
@@ -38,4 +41,6 @@
 import geniusweb.references.Reference;
 import tudelft.utilities.listener.DefaultListenable;
+import tudelft.utilities.logging.ReportToLogger;
+import tudelft.utilities.logging.Reporter;
 
 public class BoaPartyTest {
@@ -56,7 +61,10 @@
 	@Test(expected = RuntimeException.class)
 	public void smokeTestMissingInit() {
-		BoaParty boa = new BoaParty();
+
+		Reporter reporter = spy(new ReportToLogger("test"));
+		BoaParty boa = new BoaParty(reporter);
 		boa.connect(connection);
 		boa.notifyChange(mock(ActionDone.class));
+		verify(reporter, times(1)).log(Level.SEVERE, any());
 	}
 
@@ -83,6 +91,5 @@
 		boa.notifyChange(info);
 		// weird bug in Mockito? Work around with a weird cast...
-		verify(state).with(eq(info), any(bsMock.class), any(asMock.class),
-				eq(omMock.class));
+		verify(state).with(eq(info), eq(omMock.class));
 	}
 
@@ -107,7 +114,7 @@
 		assertEquals(1, connection.getActions().size());
 		System.out.println("party did action:" + connection.getActions());
-		// this should come out of bidding strat as there is no acceptable offer
-		// Because asMock always accepts, this should accept.
-		assertTrue(connection.getActions().get(0) instanceof Accept);
+		// The mock offerstrat gives an offer.
+		// the mock acceptstrat just passes on the offer.
+		assertTrue(connection.getActions().get(0) instanceof Offer);
 	}
 
@@ -121,5 +128,5 @@
 		boa.notifyChange(new ActionDone(othersOffer));
 		boa.notifyChange(new ActionDone(accept));
-		assertEquals(otherBid, boa.getLastBid());
+		assertEquals(otherBid, boa.getState().getLastReceivedOffer().getBid());
 
 	}
@@ -147,6 +154,6 @@
 
 	@Override
-	public Boolean isAcceptable(Bid bid, BoaState negoState) {
-		return true;
+	public Action filter(Action action, BoaState boaState) {
+		return action;
 	}
 
Index: boa/src/test/java/geniusweb/boa/acceptancestrategy/TimeDepAccStratTest.java
===================================================================
--- boa/src/test/java/geniusweb/boa/acceptancestrategy/TimeDepAccStratTest.java	(revision 32)
+++ boa/src/test/java/geniusweb/boa/acceptancestrategy/TimeDepAccStratTest.java	(revision 33)
@@ -13,4 +13,7 @@
 import org.junit.Test;
 
+import geniusweb.actions.Accept;
+import geniusweb.actions.Offer;
+import geniusweb.actions.PartyId;
 import geniusweb.bidspace.BidsWithUtility;
 import geniusweb.bidspace.Interval;
@@ -32,4 +35,5 @@
 	private final Settings settings = mock(Settings.class);
 	private final LinearAdditive linearprofile = mock(LinearAdditive.class);
+	private PartyId party = new PartyId("someparty");
 
 	@Before
@@ -60,5 +64,5 @@
 				.thenReturn(BigDecimal.valueOf(0.4));
 
-		assertFalse(ac.isAcceptable(bid1, state));
+		assertFalse(ac.filter(new Offer(party, bid1), state) instanceof Accept);
 	}
 
@@ -81,6 +85,6 @@
 		when(linearprofile.getUtility(eq(bid1)))
 				.thenReturn(new BigDecimal("0.4")); // now =max util
-
-		assertTrue(ac.isAcceptable(bid1, state));
+		when(state.getLastReceivedOffer()).thenReturn(new Offer(party, bid1));
+		assertTrue(ac.filter(new Offer(party, bid1), state) instanceof Accept);
 	}
 
@@ -100,8 +104,10 @@
 		when(progress.get(any())).thenReturn(1.0d);
 
+		when(state.getLastReceivedOffer()).thenReturn(new Offer(party, bid1));
 		when(linearprofile.getUtility(eq(bid1)))
 				.thenReturn(BigDecimal.valueOf(0.4));
 
-		assertTrue(ac.isAcceptable(bid1, state));
+		when(state.getLastReceivedOffer()).thenReturn(new Offer(party, bid1));
+		assertTrue(ac.filter(new Offer(party, bid1), state) instanceof Accept);
 	}
 
@@ -132,5 +138,6 @@
 
 		// bid1 has util 0.4 which is below res value.
-		assertFalse(ac.isAcceptable(bid1, state));
+		when(state.getLastReceivedOffer()).thenReturn(new Offer(party, bid1));
+		assertFalse(ac.filter(new Offer(party, bid1), state) instanceof Accept);
 	}
 
Index: boa/src/test/resources/testprofile.json
===================================================================
--- boa/src/test/resources/testprofile.json	(revision 32)
+++ boa/src/test/resources/testprofile.json	(revision 33)
@@ -3,5 +3,5 @@
 		"issueUtilities": {
 			"issue2": {
-				"numberutils": {
+				"NumberValueSetUtilities": {
 					"lowValue": 12,
 					"lowUtility": 0.3,
@@ -11,5 +11,5 @@
 			},
 			"issue1": {
-				"discreteutils": {
+				"DiscreteValueSetUtilities": {
 					"valueUtilities": {
 						"issue1value1": 0.2,
@@ -27,9 +27,5 @@
 			"issuesValues": {
 				"issue2": {
-					"range": [
-						"12",
-						"18",
-						"1"
-					]
+					"range": { "low":12,"high":18,"step":1 }
 				},
 				"issue1": {
