Removed checkstyle warnings

Removed checkstyle warnings in policy/common/im

Issue-ID: POLICY-695
Change-Id: I32b4797249386c0d1bd0f50792880a1759503a67
Signed-off-by: mmis <michael.morris@ericsson.com>

8 files changed, 3082 insertions, 3049 deletions

diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/AllSeemsWellTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/AllSeemsWellTest.java
index 967ca739..806c404c 100644
--- a/integrity-monitor/src/test/java/org/onap/policy/common/im/AllSeemsWellTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/AllSeemsWellTest.java
@@ -35,139 +35,148 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class AllSeemsWellTest extends IntegrityMonitorTestBase {
-	private static Logger logger = LoggerFactory.getLogger(AllSeemsWellTest.class);
-
-	private static final long STATE_CYCLE_MS = 3 * CYCLE_INTERVAL_MS;
-
-	private static Properties myProp;
-	private static String resourceName;
-
-	@BeforeClass
-	public static void setUpClass() throws Exception {
-		IntegrityMonitorTestBase.setUpBeforeClass(DEFAULT_DB_URL_PREFIX + AllSeemsWellTest.class.getSimpleName());
-
-		resourceName = IntegrityMonitorTestBase.siteName + "." + IntegrityMonitorTestBase.nodeType;
-	}
-
-	@AfterClass
-	public static void tearDownClass() throws Exception {
-		IntegrityMonitorTestBase.tearDownAfterClass();
-	}
-
-	@Before
-	public void setUp() {
-		super.setUpTest();
-
-		myProp = makeProperties();
-
-	}
-
-	@After
-	public void tearDown() {
-		super.tearDownTest();
-	}
-
-	// Ignore
-	@Test
-	public void testAllSeemsWell() throws Exception {
-		logger.debug("\nIntegrityMonitorTest: Entering testAllSeemsWell\n\n");
-
-		// parameters are passed via a properties file
-		myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "");
-		myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
-		myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
-		myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
-		myProp.put(IntegrityMonitorProperties.FAILED_COUNTER_THRESHOLD, "1");
-		myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "5");
-		myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "1");
-		myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "1");
-
-		IntegrityMonitor.updateProperties(myProp);
-		/*
-		 * The monitorInterval is 5 and the failedCounterThreshold is 1 A
-		 * forward progress will be stale after 5 seconds.
-		 */
-
-		IntegrityMonitor im = IntegrityMonitor.getInstance(resourceName, myProp);
-
-		StateManagement sm = im.getStateManager();
-
-		// Give it time to set the states in the DB
-		Thread.sleep(STATE_CYCLE_MS);
-
-		// Check the state
-		logger.debug(
-				"\n\ntestAllSeemsWell starting im state \nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		assertEquals(StateManagement.ENABLED, sm.getOpState());
-
-		// Indicate a failure
-		im.allSeemsWell(this.getClass().getName(), IntegrityMonitorProperties.ALLNOTWELL,
-				"'AllSeemsWellTest - ALLNOTWELL'");
-
-		// Wait for the state to change due to ALLNOTWELL
-		Thread.sleep(STATE_CYCLE_MS);
-		// Check the state
-		logger.debug(
-				"\n\ntestAllSeemsWell after ALLNOTWELL: im state \nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		// assertEquals(StateManagement.DISABLED, sm.getOpState());
-
-		Map<String, String> allNotWellMap = im.getAllNotWellMap();
-		for (String key : allNotWellMap.keySet()) {
-			logger.debug("AllSeemsWellTest: allNotWellMap: key = {}  msg = {}", key, allNotWellMap.get(key));
-		}
-		// assertEquals(1, allNotWellMap.size());
-
-		Map<String, String> allSeemsWellMap = im.getAllSeemsWellMap();
-		// assertTrue(allSeemsWellMap.isEmpty());
-
-		// Return to normal
-		im.allSeemsWell(this.getClass().getName(), IntegrityMonitorProperties.ALLSEEMSWELL,
-				"'AllSeemsWellTest - ALLSEEMSWELL'");
-
-		// Wait for the state to change due to ALLNOTWELL
-		Thread.sleep(STATE_CYCLE_MS);
-		// Check the state
-		logger.debug(
-				"\n\ntestAllSeemsWell after ALLSEEMSWELL: im state \nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		// assertEquals(StateManagement.ENABLED, sm.getOpState());
-
-		allNotWellMap = im.getAllNotWellMap();
-		assertTrue(allNotWellMap.isEmpty());
-
-		allSeemsWellMap = im.getAllSeemsWellMap();
-		assertEquals(1, allSeemsWellMap.size());
-		for (String key : allSeemsWellMap.keySet()) {
-			logger.debug("AllSeemsWellTest: allSeemsWellMap: key = {}  msg = {}", key, allSeemsWellMap.get(key));
-		}
-
-		// Check for null parameters
-		assertException(im, imx -> {
-			imx.allSeemsWell(null, IntegrityMonitorProperties.ALLSEEMSWELL, "'AllSeemsWellTest - ALLSEEMSWELL'");
-		});
-
-		assertException(im, imx -> {
-			im.allSeemsWell("", IntegrityMonitorProperties.ALLSEEMSWELL, "'AllSeemsWellTest - ALLSEEMSWELL'");
-		});
-
-		assertException(im, imx -> {
-			im.allSeemsWell(this.getClass().getName(), null, "'AllSeemsWellTest - ALLSEEMSWELL'");
-		});
-
-		assertException(im, imx -> {
-			im.allSeemsWell(this.getClass().getName(), IntegrityMonitorProperties.ALLSEEMSWELL, null);
-		});
-
-		assertException(im, imx -> {
-			im.allSeemsWell(this.getClass().getName(), IntegrityMonitorProperties.ALLSEEMSWELL, "");
-		});
-
-		logger.debug("\n\ntestAllSeemsWell: Exit\n\n");
-	}
+    private static Logger logger = LoggerFactory.getLogger(AllSeemsWellTest.class);
+
+    private static final long STATE_CYCLE_MS = 3 * CYCLE_INTERVAL_MS;
+
+    private static Properties myProp;
+    private static String resourceName;
+
+    /**
+     * Set up for test class.
+     */
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IntegrityMonitorTestBase.setUpBeforeClass(DEFAULT_DB_URL_PREFIX + AllSeemsWellTest.class.getSimpleName());
+
+        resourceName = IntegrityMonitorTestBase.siteName + "." + IntegrityMonitorTestBase.nodeType;
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        IntegrityMonitorTestBase.tearDownAfterClass();
+    }
+
+    /**
+     * Set up for test cases.
+     */
+    @Before
+    public void setUp() {
+        super.setUpTest();
+
+        myProp = makeProperties();
+
+    }
+
+    @After
+    public void tearDown() {
+        super.tearDownTest();
+    }
+
+    // Ignore
+    @Test
+    public void testAllSeemsWell() throws Exception {
+        logger.debug("\nIntegrityMonitorTest: Entering testAllSeemsWell\n\n");
+
+        // parameters are passed via a properties file
+        myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "");
+        myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
+        myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
+        myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
+        myProp.put(IntegrityMonitorProperties.FAILED_COUNTER_THRESHOLD, "1");
+        myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "5");
+        myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "1");
+        myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "1");
+
+        IntegrityMonitor.updateProperties(myProp);
+        /*
+         * The monitorInterval is 5 and the failedCounterThreshold is 1 A forward progress will be
+         * stale after 5 seconds.
+         */
+
+        IntegrityMonitor im = IntegrityMonitor.getInstance(resourceName, myProp);
+
+        StateManagement sm = im.getStateManager();
+
+        // Give it time to set the states in the DB
+        Thread.sleep(STATE_CYCLE_MS);
+
+        // Check the state
+        logger.debug(
+                "\n\ntestAllSeemsWell starting im state \nAdminState = {}\nOpState() = {}\nAvailStatus = {}\n"
+                        + "StandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        assertEquals(StateManagement.ENABLED, sm.getOpState());
+
+        // Indicate a failure
+        im.allSeemsWell(this.getClass().getName(), IntegrityMonitorProperties.ALLNOTWELL,
+                "'AllSeemsWellTest - ALLNOTWELL'");
+
+        // Wait for the state to change due to ALLNOTWELL
+        Thread.sleep(STATE_CYCLE_MS);
+        // Check the state
+        logger.debug(
+                "\n\ntestAllSeemsWell after ALLNOTWELL: im state \nAdminState = {}\nOpState() = {}\nAvailStatus = "
+                        + "{}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        // assertEquals(StateManagement.DISABLED, sm.getOpState());
+
+        Map<String, String> allNotWellMap = im.getAllNotWellMap();
+        for (String key : allNotWellMap.keySet()) {
+            logger.debug("AllSeemsWellTest: allNotWellMap: key = {}  msg = {}", key, allNotWellMap.get(key));
+        }
+        // assertEquals(1, allNotWellMap.size());
+
+        im.getAllSeemsWellMap();
+        // assertTrue(allSeemsWellMap.isEmpty());
+
+        // Return to normal
+        im.allSeemsWell(this.getClass().getName(), IntegrityMonitorProperties.ALLSEEMSWELL,
+                "'AllSeemsWellTest - ALLSEEMSWELL'");
+
+        // Wait for the state to change due to ALLNOTWELL
+        Thread.sleep(STATE_CYCLE_MS);
+        // Check the state
+        logger.debug(
+                "\n\ntestAllSeemsWell after ALLSEEMSWELL: im state \nAdminState = {}\nOpState() = {}\nAvailStatus = "
+                        + "{}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        // assertEquals(StateManagement.ENABLED, sm.getOpState());
+
+        allNotWellMap = im.getAllNotWellMap();
+        assertTrue(allNotWellMap.isEmpty());
+
+        Map<String, String> allSeemsWellMap = im.getAllSeemsWellMap();
+        assertEquals(1, allSeemsWellMap.size());
+        for (String key : allSeemsWellMap.keySet()) {
+            logger.debug("AllSeemsWellTest: allSeemsWellMap: key = {}  msg = {}", key, allSeemsWellMap.get(key));
+        }
+
+        // Check for null parameters
+        assertException(im, imx -> {
+            imx.allSeemsWell(null, IntegrityMonitorProperties.ALLSEEMSWELL, "'AllSeemsWellTest - ALLSEEMSWELL'");
+        });
+
+        assertException(im, imx -> {
+            im.allSeemsWell("", IntegrityMonitorProperties.ALLSEEMSWELL, "'AllSeemsWellTest - ALLSEEMSWELL'");
+        });
+
+        assertException(im, imx -> {
+            im.allSeemsWell(this.getClass().getName(), null, "'AllSeemsWellTest - ALLSEEMSWELL'");
+        });
+
+        assertException(im, imx -> {
+            im.allSeemsWell(this.getClass().getName(), IntegrityMonitorProperties.ALLSEEMSWELL, null);
+        });
+
+        assertException(im, imx -> {
+            im.allSeemsWell(this.getClass().getName(), IntegrityMonitorProperties.ALLSEEMSWELL, "");
+        });
+
+        logger.debug("\n\ntestAllSeemsWell: Exit\n\n");
+    }
 
 }
diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/ExceptionsTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/ExceptionsTest.java
index 90de7c66..f3cb1eff 100644
--- a/integrity-monitor/src/test/java/org/onap/policy/common/im/ExceptionsTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/ExceptionsTest.java
@@ -23,14 +23,6 @@ package org.onap.policy.common.im;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.onap.policy.common.im.AdministrativeStateException;
-import org.onap.policy.common.im.AllSeemsWellException;
-import org.onap.policy.common.im.ForwardProgressException;
-import org.onap.policy.common.im.IntegrityMonitorException;
-import org.onap.policy.common.im.IntegrityMonitorPropertiesException;
-import org.onap.policy.common.im.StandbyStatusException;
-import org.onap.policy.common.im.StateManagementException;
-import org.onap.policy.common.im.StateTransitionException;
 import org.onap.policy.common.im.jmx.ComponentAdminException;
 import org.onap.policy.common.utils.test.ExceptionsTester;
 
@@ -39,48 +31,48 @@ import org.onap.policy.common.utils.test.ExceptionsTester;
  */
 public class ExceptionsTest extends ExceptionsTester {
 
-	@Test
-	public void testStateTransitionException() throws Exception {
-		assertEquals(4, test(StateTransitionException.class));
-	}
+    @Test
+    public void testStateTransitionException() throws Exception {
+        assertEquals(4, test(StateTransitionException.class));
+    }
 
-	@Test
-	public void testStateManagementException() throws Exception {
-		assertEquals(4, test(StateManagementException.class));
-	}
+    @Test
+    public void testStateManagementException() throws Exception {
+        assertEquals(4, test(StateManagementException.class));
+    }
 
-	@Test
-	public void testStandbyStatusException() throws Exception {
-		assertEquals(5, test(StandbyStatusException.class));
-	}
+    @Test
+    public void testStandbyStatusException() throws Exception {
+        assertEquals(5, test(StandbyStatusException.class));
+    }
 
-	@Test
-	public void testIntegrityMonitorPropertiesException() throws Exception {
-		assertEquals(4, test(IntegrityMonitorPropertiesException.class));
-	}
+    @Test
+    public void testIntegrityMonitorPropertiesException() throws Exception {
+        assertEquals(4, test(IntegrityMonitorPropertiesException.class));
+    }
 
-	@Test
-	public void testIntegrityMonitorException() throws Exception {
-		assertEquals(5, test(IntegrityMonitorException.class));
-	}
+    @Test
+    public void testIntegrityMonitorException() throws Exception {
+        assertEquals(5, test(IntegrityMonitorException.class));
+    }
 
-	@Test
-	public void testForwardProgressException() throws Exception {
-		assertEquals(4, test(ForwardProgressException.class));
-	}
+    @Test
+    public void testForwardProgressException() throws Exception {
+        assertEquals(4, test(ForwardProgressException.class));
+    }
 
-	@Test
-	public void testAllSeemsWellException() throws Exception {
-		assertEquals(4, test(AllSeemsWellException.class));
-	}
+    @Test
+    public void testAllSeemsWellException() throws Exception {
+        assertEquals(4, test(AllSeemsWellException.class));
+    }
 
-	@Test
-	public void testAdministrativeStateException() throws Exception {
-		assertEquals(4, test(AdministrativeStateException.class));
-	}
+    @Test
+    public void testAdministrativeStateException() throws Exception {
+        assertEquals(4, test(AdministrativeStateException.class));
+    }
 
-	@Test
-	public void testComponentAdminException() throws Exception {
-		assertEquals(4, test(ComponentAdminException.class));
-	}
+    @Test
+    public void testComponentAdminException() throws Exception {
+        assertEquals(4, test(ComponentAdminException.class));
+    }
 }
diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTest.java
index 3704b07d..7f1e5516 100644
--- a/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTest.java
@@ -51,857 +51,873 @@ import org.slf4j.LoggerFactory;
  * tasks.
  */
 public class IntegrityMonitorTest extends IntegrityMonitorTestBase {
-	private static Logger logger = LoggerFactory.getLogger(IntegrityMonitorTest.class);
-
-	private static Properties myProp;
-	private static EntityTransaction et;
-	private static String resourceName;
-
-	private BlockingQueue<CountDownLatch> queue;
-
-	@BeforeClass
-	public static void setUpClass() throws Exception {
-		IntegrityMonitorTestBase.setUpBeforeClass(DEFAULT_DB_URL_PREFIX + IntegrityMonitorTest.class.getSimpleName());
-
-		resourceName = IntegrityMonitorTestBase.siteName + "." + IntegrityMonitorTestBase.nodeType;
-	}
-
-	@AfterClass
-	public static void tearDownClass() throws Exception {
-		IntegrityMonitorTestBase.tearDownAfterClass();
-	}
-
-	@Before
-	public void setUp() throws Exception {
-		super.setUpTest();
-
-		myProp = makeProperties();
-		et = null;
-	}
-
-	@After
-	public void tearDown() throws Exception {
-		if (et != null && et.isActive()) {
-			try {
-				et.rollback();
-
-			} catch (RuntimeException e) {
-				logger.error("cannot rollback transaction", e);
-			}
-		}
-
-		super.tearDownTest();
-	}
-
-	/*
-	 * The following test verifies the following test cases: New Install New
-	 * Install - Bad Dependency data Recovery from bad dependency data Lock Lock
-	 * restart Unlock Unlock restart
-	 */
-	@Test
-	public void testSanityJmx() throws Exception {
-		logger.debug("\nIntegrityMonitorTest: Entering testSanityJmx\n\n");
-
-		String dependent = "group1_logparser";
-
-		// parameters are passed via a properties file
-		myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, dependent);
-		myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "true");
-		// Disable the integrity monitor so it will not interfere
-		myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
-		// Disable the refresh state audit
-		myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable the state audit
-		myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable the test transaction
-		myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
-		// Disable the write FPC
-		myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
-		// Speed up the check
-		myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "1");
-		// Fail dependencies after three seconds
-		myProp.put(IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL, "3");
-
-		IntegrityMonitor im = makeMonitor(resourceName, myProp);
-		logger.debug(
-				"\n\ntestSanityJmx starting im state \nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				im.getStateManager().getAdminState(), im.getStateManager().getOpState(),
-				im.getStateManager().getAvailStatus(), im.getStateManager().getStandbyStatus());
-		// add an entry to Resource registration table in the DB for the
-		// dependent resource
-
-		et = em.getTransaction();
-		et.begin();
-		Query rquery = em.createQuery("Select r from ResourceRegistrationEntity r where r.resourceName=:rn");
-		rquery.setParameter("rn", dependent);
-
-		@SuppressWarnings("rawtypes")
-		List rrList = rquery.getResultList();
-		ResourceRegistrationEntity rrx = null;
-		if (rrList.isEmpty()) {
-			// register resource by adding entry to table in DB
-			logger.debug("Adding resource {}  to ResourceRegistration table", dependent);
-			rrx = new ResourceRegistrationEntity();
-			// set columns in entry
-			rrx.setResourceName(dependent);
-			rrx.setResourceUrl("service:jmx:somewhere:9999");
-			rrx.setNodeType("logparser");
-			rrx.setSite("siteA");
-		}
-		em.persist(rrx);
-		// flush to the DB
-		em.flush();
-
-		// commit transaction
-		et.commit();
-
-		// wait for the FPManager to check dependency health
-		waitStep();
-
-		assertException(im, imx -> {
-			imx.evaluateSanity();
-		});
-
-		// undo dependency groups and jmx test properties settings
-		myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "");
-		myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
-		IntegrityMonitor.updateProperties(myProp);
-
-		logger.debug("\ntestSantityJmx ending properties: {}", myProp);
-
-		// We know at this point that the IM is disable-dependency. We want to
-		// be
-		// sure it will recover from this condition since the properties were
-		// updated.
-
-		logger.debug(
-				"\n\ntestSanityJmx ending im state\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				im.getStateManager().getAdminState(), im.getStateManager().getOpState(),
-				im.getStateManager().getAvailStatus(), im.getStateManager().getStandbyStatus());
-
-		logger.debug("\ntestSanityJmx restarting the IntegrityMonitor");
-		// Create a new instance. It should recover from the disabled-dependency
-		// condition
-		im = makeMonitor(resourceName, myProp);
-
-		logger.debug(
-				"\n\ntestSanityJmx state after creating new im\n"
-						+ "AdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				im.getStateManager().getAdminState(), im.getStateManager().getOpState(),
-				im.getStateManager().getAvailStatus(), im.getStateManager().getStandbyStatus());
-
-		// Verify the state
-		assertEquals(StateManagement.UNLOCKED, im.getStateManager().getAdminState());
-		assertEquals(StateManagement.ENABLED, im.getStateManager().getOpState());
-		assertEquals(StateManagement.NULL_VALUE, im.getStateManager().getAvailStatus());
-		assertEquals(StateManagement.NULL_VALUE, im.getStateManager().getStandbyStatus());
-
-		// Test state manager via the IntegrityMonitor
-		StateManagement sm = im.getStateManager();
-
-		// Verify lock state
-		sm.lock();
-		logger.debug("\n\nsm.lock()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-		assertEquals(StateManagement.LOCKED, sm.getAdminState());
-
-		// Verify lock persists across a restart
-		logger.debug("\ntestSanityJmx restarting the IntegrityMonitor");
-		// Create a new instance. It should come up with the admin state locked
-		im = makeMonitor(resourceName, myProp);
-		sm = im.getStateManager();
-		logger.debug(
-				"\n\ntestSanityJmx restart with AdminState=locked"
-						+ "\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-		assertEquals(StateManagement.LOCKED, sm.getAdminState());
-
-		// Verify unlock
-		sm.unlock();
-		logger.debug(
-				"\n\ntestSanityJmx sm.unlock\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-		assertEquals(StateManagement.UNLOCKED, sm.getAdminState());
-
-		// Verify unlock restart
-		logger.debug("\ntestSanityJmx restarting the IntegrityMonitor");
-		// Create a new instance. It should come up with the admin state locked
-		im = makeMonitor(resourceName, myProp);
-		sm = im.getStateManager();
-		logger.debug(
-				"\n\ntestSanityJmx restart with AdminState=unlocked\n"
-						+ "AdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		assertEquals(StateManagement.UNLOCKED, sm.getAdminState());
-
-		logger.debug("\n\ntestSanityJmx: Exit\n\n");
-	}
-
-	@Test
-	public void testIM() throws Exception {
-		logger.debug("\nIntegrityMonitorTest: Entering testIM\n\n");
-
-		// Disable the integrity monitor so it will not interfere
-		myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
-		// Disable dependency checking
-		myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "-1");
-		// Disable the refresh state audit
-		myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable the state audit
-		myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable the test transaction
-		myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
-		// Disable writing the FPC
-		myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
-
-		IntegrityMonitor im = makeMonitor(resourceName, myProp);
-
-		logger.debug("\n\nim initial state: \nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				im.getStateManager().getAdminState(), im.getStateManager().getOpState(),
-				im.getStateManager().getAvailStatus(), im.getStateManager().getStandbyStatus());
-
-		waitStep();
-
-		// test evaluate sanity
-		assertNoException(im, imx -> {
-			imx.evaluateSanity();
-		});
-
-		// Test startTransaction - should work since it is unlocked
-		assertNoException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		// Test state manager via the IntegrityMonitor
-		StateManagement sm = im.getStateManager();
-
-		sm.lock();
-
-		logger.debug("\n\nsm.lock()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		assertEquals(StateManagement.LOCKED, sm.getAdminState());
-
-		// test startTransaction. It should fail since it is locked
-		assertException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		sm.unlock();
-		logger.debug("\n\nsm.unlock()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-		assertEquals(StateManagement.UNLOCKED, sm.getAdminState());
-
-		// test startTransaction. It should succeed
-		assertNoException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		sm.disableDependency();
-		logger.debug(
-				"\n\nsm.disableDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		assertEquals(StateManagement.DISABLED, sm.getOpState());
-		assertEquals(StateManagement.DEPENDENCY, sm.getAvailStatus());
-
-		// test startTransaction. It should succeed since standby status is null
-		// and unlocked
-		assertNoException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		sm.enableNoDependency();
-
-		logger.debug(
-				"\n\nsm.enableNoDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-		assertEquals(StateManagement.ENABLED, sm.getOpState());
-		// test startTransaction. It should succeed since standby status is null
-		// and unlocked
-		assertNoException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		sm.disableFailed();
-		logger.debug("\n\nsm.disableFailed()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		assertEquals(StateManagement.DISABLED, sm.getOpState());
-		assertEquals(StateManagement.FAILED, sm.getAvailStatus());
-		// test startTransaction. It should succeed since standby status is null
-		// and unlocked
-		assertNoException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		sm.enableNotFailed();
-
-		logger.debug(
-				"\n\nsm.enabledNotFailed()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		assertEquals(StateManagement.ENABLED, sm.getOpState());
-		// test startTransaction. It should succeed since standby status is null
-		// and unlocked
-		assertNoException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		sm.demote();
-
-		logger.debug("\n\nsm.demote()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		assertEquals(StateManagement.HOT_STANDBY, sm.getStandbyStatus());
-
-		// test startTransaction. It should fail since it is standby
-		assertException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		sm.promote();
-
-		logger.debug("\n\nsm.promote()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		assertEquals(StateManagement.PROVIDING_SERVICE, sm.getStandbyStatus());
-
-		// test startTransaction. It should succeed since it is providing
-		// service
-		assertNoException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		// Test the multi-valued availability status
-		sm.disableDependency();
-		sm.disableFailed();
-
-		logger.debug(
-				"\n\nsm.disableDependency(), sm.disableFailed\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		assertEquals(StateManagement.DEPENDENCY_FAILED, sm.getAvailStatus());
-
-		// Test startTransaction. Should fail since standby status is cold
-		// standby
-		assertException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		sm.enableNoDependency();
-
-		logger.debug(
-				"\n\nsm.enableNoDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-		assertEquals(StateManagement.FAILED, sm.getAvailStatus());
-		// Test startTransaction. Should fail since standby status is cold
-		// standby
-		assertException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		sm.disableDependency();
-		sm.enableNotFailed();
-
-		logger.debug(
-				"\n\nsm.disableDependency(),sm.enableNotFailed()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-
-		assertEquals(StateManagement.DEPENDENCY, sm.getAvailStatus());
-		// Test startTransaction. Should fail since standby status is cold
-		// standby
-		assertException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		sm.enableNoDependency();
-		logger.debug(
-				"\n\nsm.enableNoDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
-				sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
-		assertEquals(StateManagement.ENABLED, sm.getOpState());
-		// test startTransaction. It should fail since standby status is hot
-		// standby
-		assertException(im, imx -> {
-			imx.startTransaction();
-		});
-
-		logger.debug("\n\ntestIM: Exit\n\n");
-	}
-
-	@Test
-	public void testSanityState() throws Exception {
-		logger.debug("\nIntegrityMonitorTest: Entering testSanityState\n\n");
-
-		// parameters are passed via a properties file
-		myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "group1_dep1,group1_dep2; group2_dep1");
-		// Disable the integrity monitor so it will not interfere
-		myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
-		// Disable the refresh state audit
-		myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable dependency checking so it does not interfere
-		myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "-1");
-		// Disable the state audit
-		myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable the test transaction
-		myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
-		// Disable writing the FPC
-		myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
-		// Max interval for use in deciding if a FPC entry is stale in seconds
-		myProp.put(IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL, "120");
-
-		IntegrityMonitor im = makeMonitor(resourceName, myProp);
-
-		waitStep();
-
-		// Add a group1 dependent resources to put an entry in the forward
-		// progress table
-		ForwardProgressEntity fpe = new ForwardProgressEntity();
-		ForwardProgressEntity fpe2 = new ForwardProgressEntity();
-		fpe.setFpcCount(0);
-		fpe.setResourceName("group1_dep1");
-		fpe2.setFpcCount(0);
-		fpe2.setResourceName("group1_dep2");
-		et = em.getTransaction();
-		et.begin();
-		em.persist(fpe);
-		em.persist(fpe2);
-		em.flush();
-		et.commit();
-
-		// Add a group2 dependent resource to the StateManagementEntity DB table
-		// and set its admin state to locked
-		// Expect sanity test to fail.
-		StateManagement stateManager = new StateManagement(emf, "group2_dep1");
-		stateManager.lock();
-
-		new StateManagement(emf, "group1_dep1");
-		new StateManagement(emf, "group1_dep2");
-
-		// Call the dependency check directly instead of waiting for FPManager
-		// to do it.
-		logger.debug("\n\nIntegrityMonitor.testSanityState: calling im.dependencyCheck()\n\n");
-		im.dependencyCheck();
-		assertException(im, imx -> {
-			imx.evaluateSanity();
-		});
-
-		logger.debug("\n\ntestSanityState: Exit\n\n");
-	}
-
-	@Test
-	public void testRefreshStateAudit() throws Exception {
-		logger.debug("\nIntegrityMonitorTest: testRefreshStateAudit Enter\n\n");
-
-		// parameters are passed via a properties file
-		myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "");
-		myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
-		// Disable the integrity monitor so it will not interfere
-		myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
-		// Disable the refresh state audit
-		myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable dependency checking so it does not interfere
-		myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "-1");
-		// Disable the state audit
-		myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable the test transaction
-		myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
-		// Disable writing the FPC
-		myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
-
-		IntegrityMonitor im = makeMonitor(resourceName, myProp);
-
-		waitStep();
-
-		// the state here is unlocked, enabled, null, null
-		StateManagementEntity sme = null;
-
-		Query query = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource");
-
-		query.setParameter("resource", resourceName);
-
-		// Just test that we are retrieving the right object
-		@SuppressWarnings("rawtypes")
-		List resourceList = query.getResultList();
-		if (!resourceList.isEmpty()) {
-			// exist
-			sme = (StateManagementEntity) resourceList.get(0);
-			em.refresh(sme);
-
-			logger.debug(
-					"??? -- Retrieve StateManagementEntity from database --\nsme.getResourceName() = {}\n"
-							+ "sme.getAdminState() = {}\nsme.getOpState() = {}\nsme.getAvailStatus() = {}\nsme.getStandbyStatus() = {}",
-					sme.getResourceName(), sme.getAdminState(), sme.getOpState(), sme.getAvailStatus(),
-					sme.getStandbyStatus());
-
-			assertEquals(StateManagement.UNLOCKED, sme.getAdminState());
-			assertEquals(StateManagement.ENABLED, sme.getOpState());
-			assertEquals(StateManagement.NULL_VALUE, sme.getAvailStatus());
-			assertEquals(StateManagement.NULL_VALUE, sme.getStandbyStatus());
-			logger.debug("--");
-		} else {
-			logger.debug("Record not found, resourceName: " + resourceName);
-			fail("missing record");
-		}
-
-		et = em.getTransaction();
-		et.begin();
-
-		sme.setStandbyStatus(StateManagement.COLD_STANDBY);
-		em.persist(sme);
-		em.flush();
-		et.commit();
-
-		// Run the refreshStateAudit
-		im.executeRefreshStateAudit();
-
-		// The refreshStateAudit should run and change the state to
-		// unlocked,enabled,null,hotstandby
-		StateManagementEntity sme1 = null;
-
-		Query query1 = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource");
-
-		query1.setParameter("resource", resourceName);
-
-		@SuppressWarnings("rawtypes")
-		List resourceList1 = query1.getResultList();
-		if (!resourceList1.isEmpty()) {
-			// exist
-			sme1 = (StateManagementEntity) resourceList1.get(0);
-			em.refresh(sme1);
-			logger.debug(
-					"??? -- Retrieve StateManagementEntity from database --\nsme1.getResourceName() = {}\n"
-							+ "sme1.getAdminState() = {}\nsme1.getOpState() = {}\nsme1.getAvailStatus() = {}\nsme1.getStandbyStatus() = {}",
-					sme1.getResourceName(), sme1.getAdminState(), sme1.getOpState(), sme1.getAvailStatus(),
-					sme1.getStandbyStatus());
-
-			assertEquals(StateManagement.UNLOCKED, sme1.getAdminState());
-			assertEquals(StateManagement.ENABLED, sme1.getOpState());
-			assertEquals(StateManagement.NULL_VALUE, sme1.getAvailStatus());
-			assertEquals(StateManagement.HOT_STANDBY, sme1.getStandbyStatus());
-			logger.debug("--");
-		} else {
-			logger.debug("Record not found, resourceName: " + resourceName);
-			fail("record not found");
-		}
-
-		logger.debug("\nIntegrityMonitorTest: testRefreshStateAudit Exit\n\n");
-	}
-
-	@Test
-	public void testStateCheck() throws Exception {
-		logger.debug("\nIntegrityMonitorTest: Entering testStateCheck\n\n");
-
-		// parameters are passed via a properties file
-		myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "group1_dep1");
-		myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
-		myProp.put(IntegrityMonitorProperties.FAILED_COUNTER_THRESHOLD, "1");
-		/*
-		 * The monitorInterval is set to 10 and the failedCounterThreshold is 1
-		 * because stateCheck() uses the faileCounterThreshold * monitorInterval
-		 * to determine if an entry is stale, it will be stale after 10 seconds.
-		 */
-		myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "5");
-		/*
-		 * We accelerate the test transaction and write FPC intervals because we
-		 * don't want there to be any chance of a FPC failure because of the
-		 * short monitor interval
-		 */
-		myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "1");
-		myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "2");
-		// Disable the refresh state audit
-		myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
-		// The maximum time in seconds to determine that a FPC entry is stale
-		myProp.put(IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL, "5");
-		myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "5");
-
-		IntegrityMonitor im = makeMonitor(resourceName, myProp);
-
-		// Note: do ***NOT*** do waitStep() here
-
-		// Add a group1 dependent resources to put an entry in the forward
-		// progress table
-		// This sets lastUpdated to the current time
-		ForwardProgressEntity fpe = new ForwardProgressEntity();
-		fpe.setFpcCount(0);
-		fpe.setResourceName("group1_dep1");
-		et = em.getTransaction();
-		et.begin();
-		em.persist(fpe);
-		em.flush();
-		et.commit();
-
-		new StateManagement(emf, "group1_dep1");
-
-		assertNoException(im, imx -> {
-			imx.evaluateSanity();
-		});
-
-		// wait for FPManager to perform dependency health check. Once that's
-		// done,
-		// it should now be stale and the sanity check should fail
-		waitStep();
-
-		assertException(im, imx -> {
-			imx.evaluateSanity();
-		});
-
-		logger.debug("\n\ntestStateCheck: Exit\n\n");
-	}
-
-	@Test
-	public void testGetAllForwardProgressEntity() throws Exception {
-		logger.debug("\nIntegrityMonitorTest: Entering testGetAllForwardProgressEntity\n\n");
-		// parameters are passed via a properties file
-		myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "");
-		myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
-		// Disable the integrity monitor so it will not interfere
-		myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
-		// Disable the refresh state audit
-		myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable dependency checking so it does not interfere
-		myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "-1");
-		// Disable the state audit
-		myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable the test transaction
-		myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
-		// Disable writing the FPC
-		myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
-
-		IntegrityMonitor im = makeMonitor(resourceName, myProp);
-		waitStep();
-
-		logger.debug("\nIntegrityMonitorTest: Creating ForwardProgressEntity entries\n\n");
-		// Add resource entries in the forward progress table
-		ForwardProgressEntity fpe = new ForwardProgressEntity();
-		ForwardProgressEntity fpe2 = new ForwardProgressEntity();
-		ForwardProgressEntity fpe3 = new ForwardProgressEntity();
-		fpe.setFpcCount(0);
-		fpe.setResourceName("siteA_pap2");
-		fpe2.setFpcCount(0);
-		fpe2.setResourceName("siteB_pap1");
-		fpe3.setFpcCount(0);
-		fpe3.setResourceName("siteB_pap2");
-		et = em.getTransaction();
-		et.begin();
-		em.persist(fpe);
-		em.persist(fpe2);
-		em.persist(fpe3);
-		em.flush();
-		et.commit();
-
-		logger.debug(
-				"\nIntegrityMonitorTest:testGetAllForwardProgressEntity Calling im.getAllForwardProgressEntity()\n\n");
-		List<ForwardProgressEntity> fpeList = im.getAllForwardProgressEntity();
-
-		assertEquals(4, fpeList.size());
-
-		logger.debug("\nIntegrityMonitorTest: Exit testGetAllForwardProgressEntity\n\n");
-	}
-
-	@Test
-	public void testStateAudit() throws Exception {
-		logger.debug("\nIntegrityMonitorTest: Entering testStateAudit\n\n");
-
-		// parameters are passed via a properties file
-
-		// No Dependency Groups
-		myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "");
-		// Don't use JMX
-		myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
-		// Disable the internal sanity monitoring.
-		myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
-		// Disable the dependency monitoring.
-		myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "-1");
-		// Disable the refresh state audit
-		myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
-		// Disable the test transaction
-		myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
-		// Disable the write FPC
-		myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
-		// Disable the State Audit we will call it directly
-		myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
-		// Max interval for use in deciding if a FPC entry is stale in seconds
-		myProp.put(IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL, "120");
-
-		IntegrityMonitor im = makeMonitor(resourceName, myProp);
-		waitStep();
-
-		logger.debug("\nIntegrityMonitorTest: Creating ForwardProgressEntity entries\n\n");
-		// Add resources to put an entry in the forward progress table
-		Date staleDate = new Date(0);
-		ForwardProgressEntity fpe1 = new ForwardProgressEntity();
-		ForwardProgressEntity fpe2 = new ForwardProgressEntity();
-		ForwardProgressEntity fpe3 = new ForwardProgressEntity();
-		fpe1.setFpcCount(0);
-		fpe1.setResourceName("siteA_pap2");
-		fpe2.setFpcCount(0);
-		fpe2.setResourceName("siteB_pap1");
-		fpe3.setFpcCount(0);
-		fpe3.setResourceName("siteB_pap2");
-		logger.debug("\nIntegrityMonitorTest: Creating StateManagementEntity entries\n\n");
-		StateManagementEntity sme1 = new StateManagementEntity();
-		StateManagementEntity sme2 = new StateManagementEntity();
-		StateManagementEntity sme3 = new StateManagementEntity();
-		sme1.setResourceName("siteA_pap2");
-		sme1.setAdminState(StateManagement.UNLOCKED);
-		sme1.setOpState(StateManagement.ENABLED);
-		sme1.setAvailStatus(StateManagement.NULL_VALUE);
-		sme1.setStandbyStatus(StateManagement.NULL_VALUE);
-		sme2.setResourceName("siteB_pap1");
-		sme2.setAdminState(StateManagement.UNLOCKED);
-		sme2.setOpState(StateManagement.ENABLED);
-		sme2.setAvailStatus(StateManagement.NULL_VALUE);
-		sme2.setStandbyStatus(StateManagement.NULL_VALUE);
-		sme3.setResourceName("siteB_pap2");
-		sme3.setAdminState(StateManagement.UNLOCKED);
-		sme3.setOpState(StateManagement.ENABLED);
-		sme3.setAvailStatus(StateManagement.NULL_VALUE);
-		sme3.setStandbyStatus(StateManagement.NULL_VALUE);
-		et = em.getTransaction();
-		et.begin();
-		em.persist(fpe1);
-		em.persist(fpe2);
-		em.persist(fpe3);
-		em.persist(sme1);
-		em.persist(sme2);
-		em.persist(sme3);
-		em.flush();
-		et.commit();
-
-		Query updateQuery = em.createQuery(
-				"UPDATE ForwardProgressEntity f " + "SET f.lastUpdated = :newDate " + "WHERE f.resourceName=:resource");
-		updateQuery.setParameter("newDate", staleDate, TemporalType.TIMESTAMP);
-		updateQuery.setParameter("resource", fpe1.getResourceName());
-
-		et = em.getTransaction();
-		et.begin();
-		updateQuery.executeUpdate();
-		et.commit();
-
-		logger.debug("\nIntegrityMonitorTest:testStateAudit Calling im.getAllForwardProgressEntity()\n\n");
-		List<ForwardProgressEntity> fpeList = im.getAllForwardProgressEntity();
-
-		logger.debug("\n\n");
-		logger.debug("IntegrityMonitorTest:testStateAudit:ForwardProgressEntity entries");
-		for (ForwardProgressEntity myFpe : fpeList) {
-			logger.debug("\n    ResourceName: {}" + "\n        LastUpdated: {}", myFpe.getResourceName(),
-					myFpe.getLastUpdated());
-		}
-		logger.debug("\n\n");
-
-		logger.debug("\nIntegrityMonitorTest:testStateAudit getting list of StateManagementEntity entries\n\n");
-		Query query = em.createQuery("SELECT s FROM StateManagementEntity s");
-		List<?> smeList = query.getResultList();
-
-		logger.debug("\n\n");
-		logger.debug("IntegrityMonitorTest:testStateAudit:StateManagementEntity entries");
-		for (Object mySme : smeList) {
-			StateManagementEntity tmpSme = (StateManagementEntity) mySme;
-			em.refresh(tmpSme);
-			logger.debug(
-					"\n    ResourceName: {}" + "\n        AdminState: {}" + "\n        OpState: {}"
-							+ "\n        AvailStatus: {}" + "\n        StandbyStatus: {}",
-					tmpSme.getResourceName(), tmpSme.getAdminState(), tmpSme.getOpState(), tmpSme.getAvailStatus(),
-					tmpSme.getStandbyStatus());
-		}
-		logger.debug("\n\n");
-
-		em.refresh(sme1);
-		assertEquals(StateManagement.ENABLED, sme1.getOpState());
-
-		logger.debug("IntegrityMonitorTest:testStateAudit: calling stateAudit()");
-		im.executeStateAudit();
-		logger.debug("IntegrityMonitorTest:testStateAudit: call to stateAudit() complete");
-
-		logger.debug("\nIntegrityMonitorTest:testStateAudit getting list of StateManagementEntity entries\n\n");
-		smeList = query.getResultList();
-
-		logger.debug("\n\n");
-		logger.debug("IntegrityMonitorTest:testStateAudit:StateManagementEntity entries");
-		for (Object mySme : smeList) {
-			StateManagementEntity tmpSme = (StateManagementEntity) mySme;
-			em.refresh(tmpSme);
-			logger.debug(
-					"\n    ResourceName: {}" + "\n        AdminState: {}" + "\n        OpState: {}"
-							+ "\n        AvailStatus: {}" + "\n        StandbyStatus: {}",
-					tmpSme.getResourceName(), tmpSme.getAdminState(), tmpSme.getOpState(), tmpSme.getAvailStatus(),
-					tmpSme.getStandbyStatus());
-		}
-		logger.debug("\n\n");
-
-		em.refresh(sme1);
-		assertEquals(StateManagement.DISABLED, sme1.getOpState());
-
-		// Now let's add sme2 to the mix
-		updateQuery = em.createQuery(
-				"UPDATE ForwardProgressEntity f " + "SET f.lastUpdated = :newDate " + "WHERE f.resourceName=:resource");
-		updateQuery.setParameter("newDate", staleDate, TemporalType.TIMESTAMP);
-		updateQuery.setParameter("resource", fpe2.getResourceName());
-
-		et = em.getTransaction();
-		et.begin();
-		updateQuery.executeUpdate();
-		et.commit();
-
-		// Give it a chance to write the DB and run the audit
-		logger.debug("IntegrityMonitorTest:testStateAudit: (restart4) Running State Audit");
-		waitStep();
-		im.executeStateAudit();
-		waitStep();
-		logger.debug("IntegrityMonitorTest:testStateAudit: (restart4) State Audit complete");
-
-		// Now check its state
-		logger.debug(
-				"\nIntegrityMonitorTest:testStateAudit (restart4) getting list of StateManagementEntity entries\n\n");
-		smeList = query.getResultList();
-
-		logger.debug("\n\n");
-		logger.debug("IntegrityMonitorTest:testStateAudit:StateManagementEntity (restart4) entries");
-		for (Object mySme : smeList) {
-			StateManagementEntity tmpSme = (StateManagementEntity) mySme;
-			em.refresh(tmpSme);
-
-			logger.debug(
-					"\n    (restart4) ResourceName: {}" + "\n        AdminState: {}" + "\n        OpState: {}"
-							+ "\n        AvailStatus: {}" + "\n        StandbyStatus: {}",
-					tmpSme.getResourceName(), tmpSme.getAdminState(), tmpSme.getOpState(), tmpSme.getAvailStatus(),
-					tmpSme.getStandbyStatus());
-		}
-		logger.debug("\n\n");
-
-		em.refresh(sme1);
-		assertEquals(StateManagement.DISABLED, sme1.getOpState());
-
-		em.refresh(sme2);
-		assertEquals(StateManagement.DISABLED, sme2.getOpState());
-
-		logger.debug("\nIntegrityMonitorTest: Exit testStateAudit\n\n");
-		System.out.println("\n\ntestStateAudit: Exit\n\n");
-	}
-
-	private IntegrityMonitor makeMonitor(String resourceName, Properties myProp) throws Exception {
-		IntegrityMonitor.deleteInstance();
-
-		queue = new LinkedBlockingQueue<>();
-
-		IntegrityMonitor im = IntegrityMonitor.getInstance(resourceName, myProp, queue);
-
-		// wait for the monitor thread to start
-		waitStep();
-
-		return im;
-	}
-
-	/**
-	 * Waits for the FPManager to complete another cycle.
-	 * 
-	 * @throws InterruptedException
-	 */
-	private void waitStep() throws InterruptedException {
-		CountDownLatch latch = new CountDownLatch(1);
-		queue.offer(latch);
-		waitLatch(latch);
-	}
+    private static Logger logger = LoggerFactory.getLogger(IntegrityMonitorTest.class);
+
+    private static Properties myProp;
+    private static EntityTransaction et;
+    private static String resourceName;
+
+    private BlockingQueue<CountDownLatch> queue;
+
+    /**
+     * Set up for test class.
+     */
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IntegrityMonitorTestBase.setUpBeforeClass(DEFAULT_DB_URL_PREFIX + IntegrityMonitorTest.class.getSimpleName());
+
+        resourceName = IntegrityMonitorTestBase.siteName + "." + IntegrityMonitorTestBase.nodeType;
+    }
+
+    /**
+     * Tear down after test class.
+     */
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        IntegrityMonitorTestBase.tearDownAfterClass();
+    }
+
+    /**
+     * Set up for test cases.
+     */
+    @Before
+    public void setUp() throws Exception {
+        super.setUpTest();
+
+        myProp = makeProperties();
+        et = null;
+    }
+
+    /**
+     * Tear down after test cases.
+     */
+    @After
+    public void tearDown() throws Exception {
+        if (et != null && et.isActive()) {
+            try {
+                et.rollback();
+
+            } catch (RuntimeException e) {
+                logger.error("cannot rollback transaction", e);
+            }
+        }
+
+        super.tearDownTest();
+    }
+
+    /*
+     * The following test verifies the following test cases: New Install New Install - Bad
+     * Dependency data Recovery from bad dependency data Lock Lock restart Unlock Unlock restart
+     */
+    @Test
+    public void testSanityJmx() throws Exception {
+        logger.debug("\nIntegrityMonitorTest: Entering testSanityJmx\n\n");
+
+        String dependent = "group1_logparser";
+
+        // parameters are passed via a properties file
+        myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, dependent);
+        myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "true");
+        // Disable the integrity monitor so it will not interfere
+        myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
+        // Disable the refresh state audit
+        myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable the state audit
+        myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable the test transaction
+        myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
+        // Disable the write FPC
+        myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
+        // Speed up the check
+        myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "1");
+        // Fail dependencies after three seconds
+        myProp.put(IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL, "3");
+
+        IntegrityMonitor im = makeMonitor(resourceName, myProp);
+        logger.debug(
+                "\n\ntestSanityJmx starting im state \nAdminState = {}\nOpState() = {}\nAvailStatus = {}\n"
+                        + "StandbyStatus = {}\n",
+                im.getStateManager().getAdminState(), im.getStateManager().getOpState(),
+                im.getStateManager().getAvailStatus(), im.getStateManager().getStandbyStatus());
+        // add an entry to Resource registration table in the DB for the
+        // dependent resource
+
+        et = em.getTransaction();
+        et.begin();
+        Query rquery = em.createQuery("Select r from ResourceRegistrationEntity r where r.resourceName=:rn");
+        rquery.setParameter("rn", dependent);
+
+        @SuppressWarnings("rawtypes")
+        List rrList = rquery.getResultList();
+        ResourceRegistrationEntity rrx = null;
+        if (rrList.isEmpty()) {
+            // register resource by adding entry to table in DB
+            logger.debug("Adding resource {}  to ResourceRegistration table", dependent);
+            rrx = new ResourceRegistrationEntity();
+            // set columns in entry
+            rrx.setResourceName(dependent);
+            rrx.setResourceUrl("service:jmx:somewhere:9999");
+            rrx.setNodeType("logparser");
+            rrx.setSite("siteA");
+        }
+        em.persist(rrx);
+        // flush to the DB
+        em.flush();
+
+        // commit transaction
+        et.commit();
+
+        // wait for the FPManager to check dependency health
+        waitStep();
+
+        assertException(im, imx -> {
+            imx.evaluateSanity();
+        });
+
+        // undo dependency groups and jmx test properties settings
+        myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "");
+        myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
+        IntegrityMonitor.updateProperties(myProp);
+
+        logger.debug("\ntestSantityJmx ending properties: {}", myProp);
+
+        // We know at this point that the IM is disable-dependency. We want to
+        // be
+        // sure it will recover from this condition since the properties were
+        // updated.
+
+        logger.debug(
+                "\n\ntestSanityJmx ending im state\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\n"
+                        + "StandbyStatus = {}\n",
+                im.getStateManager().getAdminState(), im.getStateManager().getOpState(),
+                im.getStateManager().getAvailStatus(), im.getStateManager().getStandbyStatus());
+
+        logger.debug("\ntestSanityJmx restarting the IntegrityMonitor");
+        // Create a new instance. It should recover from the disabled-dependency
+        // condition
+        im = makeMonitor(resourceName, myProp);
+
+        logger.debug(
+                "\n\ntestSanityJmx state after creating new im\n"
+                        + "AdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                im.getStateManager().getAdminState(), im.getStateManager().getOpState(),
+                im.getStateManager().getAvailStatus(), im.getStateManager().getStandbyStatus());
+
+        // Verify the state
+        assertEquals(StateManagement.UNLOCKED, im.getStateManager().getAdminState());
+        assertEquals(StateManagement.ENABLED, im.getStateManager().getOpState());
+        assertEquals(StateManagement.NULL_VALUE, im.getStateManager().getAvailStatus());
+        assertEquals(StateManagement.NULL_VALUE, im.getStateManager().getStandbyStatus());
+
+        // Test state manager via the IntegrityMonitor
+        StateManagement sm = im.getStateManager();
+
+        // Verify lock state
+        sm.lock();
+        logger.debug("\n\nsm.lock()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+        assertEquals(StateManagement.LOCKED, sm.getAdminState());
+
+        // Verify lock persists across a restart
+        logger.debug("\ntestSanityJmx restarting the IntegrityMonitor");
+        // Create a new instance. It should come up with the admin state locked
+        im = makeMonitor(resourceName, myProp);
+        sm = im.getStateManager();
+        logger.debug(
+                "\n\ntestSanityJmx restart with AdminState=locked"
+                        + "\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+        assertEquals(StateManagement.LOCKED, sm.getAdminState());
+
+        // Verify unlock
+        sm.unlock();
+        logger.debug(
+                "\n\ntestSanityJmx sm.unlock\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+        assertEquals(StateManagement.UNLOCKED, sm.getAdminState());
+
+        // Verify unlock restart
+        logger.debug("\ntestSanityJmx restarting the IntegrityMonitor");
+        // Create a new instance. It should come up with the admin state locked
+        im = makeMonitor(resourceName, myProp);
+        sm = im.getStateManager();
+        logger.debug(
+                "\n\ntestSanityJmx restart with AdminState=unlocked\n"
+                        + "AdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        assertEquals(StateManagement.UNLOCKED, sm.getAdminState());
+
+        logger.debug("\n\ntestSanityJmx: Exit\n\n");
+    }
+
+    @Test
+    public void testIm() throws Exception {
+        logger.debug("\nIntegrityMonitorTest: Entering testIM\n\n");
+
+        // Disable the integrity monitor so it will not interfere
+        myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
+        // Disable dependency checking
+        myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "-1");
+        // Disable the refresh state audit
+        myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable the state audit
+        myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable the test transaction
+        myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
+        // Disable writing the FPC
+        myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
+
+        IntegrityMonitor im = makeMonitor(resourceName, myProp);
+
+        logger.debug("\n\nim initial state: \nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                im.getStateManager().getAdminState(), im.getStateManager().getOpState(),
+                im.getStateManager().getAvailStatus(), im.getStateManager().getStandbyStatus());
+
+        waitStep();
+
+        // test evaluate sanity
+        assertNoException(im, imx -> {
+            imx.evaluateSanity();
+        });
+
+        // Test startTransaction - should work since it is unlocked
+        assertNoException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        // Test state manager via the IntegrityMonitor
+        StateManagement sm = im.getStateManager();
+
+        sm.lock();
+
+        logger.debug("\n\nsm.lock()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        assertEquals(StateManagement.LOCKED, sm.getAdminState());
+
+        // test startTransaction. It should fail since it is locked
+        assertException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        sm.unlock();
+        logger.debug("\n\nsm.unlock()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+        assertEquals(StateManagement.UNLOCKED, sm.getAdminState());
+
+        // test startTransaction. It should succeed
+        assertNoException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        sm.disableDependency();
+        logger.debug(
+                "\n\nsm.disableDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        assertEquals(StateManagement.DISABLED, sm.getOpState());
+        assertEquals(StateManagement.DEPENDENCY, sm.getAvailStatus());
+
+        // test startTransaction. It should succeed since standby status is null
+        // and unlocked
+        assertNoException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        sm.enableNoDependency();
+
+        logger.debug(
+                "\n\nsm.enableNoDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+        assertEquals(StateManagement.ENABLED, sm.getOpState());
+        // test startTransaction. It should succeed since standby status is null
+        // and unlocked
+        assertNoException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        sm.disableFailed();
+        logger.debug("\n\nsm.disableFailed()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        assertEquals(StateManagement.DISABLED, sm.getOpState());
+        assertEquals(StateManagement.FAILED, sm.getAvailStatus());
+        // test startTransaction. It should succeed since standby status is null
+        // and unlocked
+        assertNoException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        sm.enableNotFailed();
+
+        logger.debug(
+                "\n\nsm.enabledNotFailed()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        assertEquals(StateManagement.ENABLED, sm.getOpState());
+        // test startTransaction. It should succeed since standby status is null
+        // and unlocked
+        assertNoException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        sm.demote();
+
+        logger.debug("\n\nsm.demote()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        assertEquals(StateManagement.HOT_STANDBY, sm.getStandbyStatus());
+
+        // test startTransaction. It should fail since it is standby
+        assertException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        sm.promote();
+
+        logger.debug("\n\nsm.promote()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        assertEquals(StateManagement.PROVIDING_SERVICE, sm.getStandbyStatus());
+
+        // test startTransaction. It should succeed since it is providing
+        // service
+        assertNoException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        // Test the multi-valued availability status
+        sm.disableDependency();
+        sm.disableFailed();
+
+        logger.debug(
+                "\n\nsm.disableDependency(), sm.disableFailed\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\n"
+                        + "StandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        assertEquals(StateManagement.DEPENDENCY_FAILED, sm.getAvailStatus());
+
+        // Test startTransaction. Should fail since standby status is cold
+        // standby
+        assertException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        sm.enableNoDependency();
+
+        logger.debug(
+                "\n\nsm.enableNoDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+        assertEquals(StateManagement.FAILED, sm.getAvailStatus());
+        // Test startTransaction. Should fail since standby status is cold
+        // standby
+        assertException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        sm.disableDependency();
+        sm.enableNotFailed();
+
+        logger.debug(
+                "\n\nsm.disableDependency(),sm.enableNotFailed()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\n"
+                        + "StandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+
+        assertEquals(StateManagement.DEPENDENCY, sm.getAvailStatus());
+        // Test startTransaction. Should fail since standby status is cold
+        // standby
+        assertException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        sm.enableNoDependency();
+        logger.debug(
+                "\n\nsm.enableNoDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n",
+                sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus());
+        assertEquals(StateManagement.ENABLED, sm.getOpState());
+        // test startTransaction. It should fail since standby status is hot
+        // standby
+        assertException(im, imx -> {
+            imx.startTransaction();
+        });
+
+        logger.debug("\n\ntestIM: Exit\n\n");
+    }
+
+    @Test
+    public void testSanityState() throws Exception {
+        logger.debug("\nIntegrityMonitorTest: Entering testSanityState\n\n");
+
+        // parameters are passed via a properties file
+        myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "group1_dep1,group1_dep2; group2_dep1");
+        // Disable the integrity monitor so it will not interfere
+        myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
+        // Disable the refresh state audit
+        myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable dependency checking so it does not interfere
+        myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "-1");
+        // Disable the state audit
+        myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable the test transaction
+        myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
+        // Disable writing the FPC
+        myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
+        // Max interval for use in deciding if a FPC entry is stale in seconds
+        myProp.put(IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL, "120");
+
+        final IntegrityMonitor im = makeMonitor(resourceName, myProp);
+
+        waitStep();
+
+        // Add a group1 dependent resources to put an entry in the forward
+        // progress table
+        ForwardProgressEntity fpe = new ForwardProgressEntity();
+        ForwardProgressEntity fpe2 = new ForwardProgressEntity();
+        fpe.setFpcCount(0);
+        fpe.setResourceName("group1_dep1");
+        fpe2.setFpcCount(0);
+        fpe2.setResourceName("group1_dep2");
+        et = em.getTransaction();
+        et.begin();
+        em.persist(fpe);
+        em.persist(fpe2);
+        em.flush();
+        et.commit();
+
+        // Add a group2 dependent resource to the StateManagementEntity DB table
+        // and set its admin state to locked
+        // Expect sanity test to fail.
+        StateManagement stateManager = new StateManagement(emf, "group2_dep1");
+        stateManager.lock();
+
+        new StateManagement(emf, "group1_dep1");
+        new StateManagement(emf, "group1_dep2");
+
+        // Call the dependency check directly instead of waiting for FPManager
+        // to do it.
+        logger.debug("\n\nIntegrityMonitor.testSanityState: calling im.dependencyCheck()\n\n");
+        im.dependencyCheck();
+        assertException(im, imx -> {
+            imx.evaluateSanity();
+        });
+
+        logger.debug("\n\ntestSanityState: Exit\n\n");
+    }
+
+    @Test
+    public void testRefreshStateAudit() throws Exception {
+        logger.debug("\nIntegrityMonitorTest: testRefreshStateAudit Enter\n\n");
+
+        // parameters are passed via a properties file
+        myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "");
+        myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
+        // Disable the integrity monitor so it will not interfere
+        myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
+        // Disable the refresh state audit
+        myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable dependency checking so it does not interfere
+        myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "-1");
+        // Disable the state audit
+        myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable the test transaction
+        myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
+        // Disable writing the FPC
+        myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
+
+        final IntegrityMonitor im = makeMonitor(resourceName, myProp);
+
+        waitStep();
+
+        // the state here is unlocked, enabled, null, null
+        StateManagementEntity sme = null;
+
+        Query query = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource");
+
+        query.setParameter("resource", resourceName);
+
+        // Just test that we are retrieving the right object
+        @SuppressWarnings("rawtypes")
+        List resourceList = query.getResultList();
+        if (!resourceList.isEmpty()) {
+            // exist
+            sme = (StateManagementEntity) resourceList.get(0);
+            em.refresh(sme);
+
+            logger.debug(
+                    "??? -- Retrieve StateManagementEntity from database --\nsme.getResourceName() = {}\n"
+                            + "sme.getAdminState() = {}\nsme.getOpState() = {}\nsme.getAvailStatus() = {}\n"
+                            + "sme.getStandbyStatus() = {}",
+                    sme.getResourceName(), sme.getAdminState(), sme.getOpState(), sme.getAvailStatus(),
+                    sme.getStandbyStatus());
+
+            assertEquals(StateManagement.UNLOCKED, sme.getAdminState());
+            assertEquals(StateManagement.ENABLED, sme.getOpState());
+            assertEquals(StateManagement.NULL_VALUE, sme.getAvailStatus());
+            assertEquals(StateManagement.NULL_VALUE, sme.getStandbyStatus());
+            logger.debug("--");
+        } else {
+            logger.debug("Record not found, resourceName: " + resourceName);
+            fail("missing record");
+        }
+
+        et = em.getTransaction();
+        et.begin();
+
+        sme.setStandbyStatus(StateManagement.COLD_STANDBY);
+        em.persist(sme);
+        em.flush();
+        et.commit();
+
+        // Run the refreshStateAudit
+        im.executeRefreshStateAudit();
+
+        // The refreshStateAudit should run and change the state to
+        // unlocked,enabled,null,hotstandby
+        StateManagementEntity sme1 = null;
+
+        Query query1 = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource");
+
+        query1.setParameter("resource", resourceName);
+
+        @SuppressWarnings("rawtypes")
+        List resourceList1 = query1.getResultList();
+        if (!resourceList1.isEmpty()) {
+            // exist
+            sme1 = (StateManagementEntity) resourceList1.get(0);
+            em.refresh(sme1);
+            logger.debug(
+                    "??? -- Retrieve StateManagementEntity from database --\nsme1.getResourceName() = {}\n"
+                            + "sme1.getAdminState() = {}\nsme1.getOpState() = {}\nsme1.getAvailStatus() = {}\n"
+                            + "sme1.getStandbyStatus() = {}",
+                    sme1.getResourceName(), sme1.getAdminState(), sme1.getOpState(), sme1.getAvailStatus(),
+                    sme1.getStandbyStatus());
+
+            assertEquals(StateManagement.UNLOCKED, sme1.getAdminState());
+            assertEquals(StateManagement.ENABLED, sme1.getOpState());
+            assertEquals(StateManagement.NULL_VALUE, sme1.getAvailStatus());
+            assertEquals(StateManagement.HOT_STANDBY, sme1.getStandbyStatus());
+            logger.debug("--");
+        } else {
+            logger.debug("Record not found, resourceName: " + resourceName);
+            fail("record not found");
+        }
+
+        logger.debug("\nIntegrityMonitorTest: testRefreshStateAudit Exit\n\n");
+    }
+
+    @Test
+    public void testStateCheck() throws Exception {
+        logger.debug("\nIntegrityMonitorTest: Entering testStateCheck\n\n");
+
+        // parameters are passed via a properties file
+        myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "group1_dep1");
+        myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
+        myProp.put(IntegrityMonitorProperties.FAILED_COUNTER_THRESHOLD, "1");
+        /*
+         * The monitorInterval is set to 10 and the failedCounterThreshold is 1 because stateCheck()
+         * uses the faileCounterThreshold * monitorInterval to determine if an entry is stale, it
+         * will be stale after 10 seconds.
+         */
+        myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "5");
+        /*
+         * We accelerate the test transaction and write FPC intervals because we don't want there to
+         * be any chance of a FPC failure because of the short monitor interval
+         */
+        myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "1");
+        myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "2");
+        // Disable the refresh state audit
+        myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
+        // The maximum time in seconds to determine that a FPC entry is stale
+        myProp.put(IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL, "5");
+        myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "5");
+
+        IntegrityMonitor im = makeMonitor(resourceName, myProp);
+
+        // Note: do ***NOT*** do waitStep() here
+
+        // Add a group1 dependent resources to put an entry in the forward
+        // progress table
+        // This sets lastUpdated to the current time
+        ForwardProgressEntity fpe = new ForwardProgressEntity();
+        fpe.setFpcCount(0);
+        fpe.setResourceName("group1_dep1");
+        et = em.getTransaction();
+        et.begin();
+        em.persist(fpe);
+        em.flush();
+        et.commit();
+
+        new StateManagement(emf, "group1_dep1");
+
+        assertNoException(im, imx -> {
+            imx.evaluateSanity();
+        });
+
+        // wait for FPManager to perform dependency health check. Once that's
+        // done,
+        // it should now be stale and the sanity check should fail
+        waitStep();
+
+        assertException(im, imx -> {
+            imx.evaluateSanity();
+        });
+
+        logger.debug("\n\ntestStateCheck: Exit\n\n");
+    }
+
+    @Test
+    public void testGetAllForwardProgressEntity() throws Exception {
+        logger.debug("\nIntegrityMonitorTest: Entering testGetAllForwardProgressEntity\n\n");
+        // parameters are passed via a properties file
+        myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "");
+        myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
+        // Disable the integrity monitor so it will not interfere
+        myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
+        // Disable the refresh state audit
+        myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable dependency checking so it does not interfere
+        myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "-1");
+        // Disable the state audit
+        myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable the test transaction
+        myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
+        // Disable writing the FPC
+        myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
+
+        final IntegrityMonitor im = makeMonitor(resourceName, myProp);
+        waitStep();
+
+        logger.debug("\nIntegrityMonitorTest: Creating ForwardProgressEntity entries\n\n");
+        // Add resource entries in the forward progress table
+        final ForwardProgressEntity fpe = new ForwardProgressEntity();
+        final ForwardProgressEntity fpe2 = new ForwardProgressEntity();
+        final ForwardProgressEntity fpe3 = new ForwardProgressEntity();
+        fpe.setFpcCount(0);
+        fpe.setResourceName("siteA_pap2");
+        fpe2.setFpcCount(0);
+        fpe2.setResourceName("siteB_pap1");
+        fpe3.setFpcCount(0);
+        fpe3.setResourceName("siteB_pap2");
+        et = em.getTransaction();
+        et.begin();
+        em.persist(fpe);
+        em.persist(fpe2);
+        em.persist(fpe3);
+        em.flush();
+        et.commit();
+
+        logger.debug(
+                "\nIntegrityMonitorTest:testGetAllForwardProgressEntity Calling im.getAllForwardProgressEntity()\n\n");
+        List<ForwardProgressEntity> fpeList = im.getAllForwardProgressEntity();
+
+        assertEquals(4, fpeList.size());
+
+        logger.debug("\nIntegrityMonitorTest: Exit testGetAllForwardProgressEntity\n\n");
+    }
+
+    @Test
+    public void testStateAudit() throws Exception {
+        logger.debug("\nIntegrityMonitorTest: Entering testStateAudit\n\n");
+
+        // parameters are passed via a properties file
+
+        // No Dependency Groups
+        myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "");
+        // Don't use JMX
+        myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false");
+        // Disable the internal sanity monitoring.
+        myProp.put(IntegrityMonitorProperties.FP_MONITOR_INTERVAL, "-1");
+        // Disable the dependency monitoring.
+        myProp.put(IntegrityMonitorProperties.CHECK_DEPENDENCY_INTERVAL, "-1");
+        // Disable the refresh state audit
+        myProp.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, "-1");
+        // Disable the test transaction
+        myProp.put(IntegrityMonitorProperties.TEST_TRANS_INTERVAL, "-1");
+        // Disable the write FPC
+        myProp.put(IntegrityMonitorProperties.WRITE_FPC_INTERVAL, "-1");
+        // Disable the State Audit we will call it directly
+        myProp.put(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, "-1");
+        // Max interval for use in deciding if a FPC entry is stale in seconds
+        myProp.put(IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL, "120");
+
+        final IntegrityMonitor im = makeMonitor(resourceName, myProp);
+        waitStep();
+
+        logger.debug("\nIntegrityMonitorTest: Creating ForwardProgressEntity entries\n\n");
+        // Add resources to put an entry in the forward progress table
+        final Date staleDate = new Date(0);
+        final ForwardProgressEntity fpe1 = new ForwardProgressEntity();
+        final ForwardProgressEntity fpe2 = new ForwardProgressEntity();
+        final ForwardProgressEntity fpe3 = new ForwardProgressEntity();
+        fpe1.setFpcCount(0);
+        fpe1.setResourceName("siteA_pap2");
+        fpe2.setFpcCount(0);
+        fpe2.setResourceName("siteB_pap1");
+        fpe3.setFpcCount(0);
+        fpe3.setResourceName("siteB_pap2");
+        logger.debug("\nIntegrityMonitorTest: Creating StateManagementEntity entries\n\n");
+        final StateManagementEntity sme1 = new StateManagementEntity();
+        final StateManagementEntity sme2 = new StateManagementEntity();
+        final StateManagementEntity sme3 = new StateManagementEntity();
+        sme1.setResourceName("siteA_pap2");
+        sme1.setAdminState(StateManagement.UNLOCKED);
+        sme1.setOpState(StateManagement.ENABLED);
+        sme1.setAvailStatus(StateManagement.NULL_VALUE);
+        sme1.setStandbyStatus(StateManagement.NULL_VALUE);
+        sme2.setResourceName("siteB_pap1");
+        sme2.setAdminState(StateManagement.UNLOCKED);
+        sme2.setOpState(StateManagement.ENABLED);
+        sme2.setAvailStatus(StateManagement.NULL_VALUE);
+        sme2.setStandbyStatus(StateManagement.NULL_VALUE);
+        sme3.setResourceName("siteB_pap2");
+        sme3.setAdminState(StateManagement.UNLOCKED);
+        sme3.setOpState(StateManagement.ENABLED);
+        sme3.setAvailStatus(StateManagement.NULL_VALUE);
+        sme3.setStandbyStatus(StateManagement.NULL_VALUE);
+        et = em.getTransaction();
+        et.begin();
+        em.persist(fpe1);
+        em.persist(fpe2);
+        em.persist(fpe3);
+        em.persist(sme1);
+        em.persist(sme2);
+        em.persist(sme3);
+        em.flush();
+        et.commit();
+
+        Query updateQuery = em.createQuery(
+                "UPDATE ForwardProgressEntity f " + "SET f.lastUpdated = :newDate " + "WHERE f.resourceName=:resource");
+        updateQuery.setParameter("newDate", staleDate, TemporalType.TIMESTAMP);
+        updateQuery.setParameter("resource", fpe1.getResourceName());
+
+        et = em.getTransaction();
+        et.begin();
+        updateQuery.executeUpdate();
+        et.commit();
+
+        logger.debug("\nIntegrityMonitorTest:testStateAudit Calling im.getAllForwardProgressEntity()\n\n");
+        List<ForwardProgressEntity> fpeList = im.getAllForwardProgressEntity();
+
+        logger.debug("\n\n");
+        logger.debug("IntegrityMonitorTest:testStateAudit:ForwardProgressEntity entries");
+        for (ForwardProgressEntity myFpe : fpeList) {
+            logger.debug("\n    ResourceName: {}" + "\n        LastUpdated: {}", myFpe.getResourceName(),
+                    myFpe.getLastUpdated());
+        }
+        logger.debug("\n\n");
+
+        logger.debug("\nIntegrityMonitorTest:testStateAudit getting list of StateManagementEntity entries\n\n");
+        Query query = em.createQuery("SELECT s FROM StateManagementEntity s");
+        List<?> smeList = query.getResultList();
+
+        logger.debug("\n\n");
+        logger.debug("IntegrityMonitorTest:testStateAudit:StateManagementEntity entries");
+        for (Object mySme : smeList) {
+            StateManagementEntity tmpSme = (StateManagementEntity) mySme;
+            em.refresh(tmpSme);
+            logger.debug(
+                    "\n    ResourceName: {}" + "\n        AdminState: {}" + "\n        OpState: {}"
+                            + "\n        AvailStatus: {}" + "\n        StandbyStatus: {}",
+                    tmpSme.getResourceName(), tmpSme.getAdminState(), tmpSme.getOpState(), tmpSme.getAvailStatus(),
+                    tmpSme.getStandbyStatus());
+        }
+        logger.debug("\n\n");
+
+        em.refresh(sme1);
+        assertEquals(StateManagement.ENABLED, sme1.getOpState());
+
+        logger.debug("IntegrityMonitorTest:testStateAudit: calling stateAudit()");
+        im.executeStateAudit();
+        logger.debug("IntegrityMonitorTest:testStateAudit: call to stateAudit() complete");
+
+        logger.debug("\nIntegrityMonitorTest:testStateAudit getting list of StateManagementEntity entries\n\n");
+        smeList = query.getResultList();
+
+        logger.debug("\n\n");
+        logger.debug("IntegrityMonitorTest:testStateAudit:StateManagementEntity entries");
+        for (Object mySme : smeList) {
+            StateManagementEntity tmpSme = (StateManagementEntity) mySme;
+            em.refresh(tmpSme);
+            logger.debug(
+                    "\n    ResourceName: {}" + "\n        AdminState: {}" + "\n        OpState: {}"
+                            + "\n        AvailStatus: {}" + "\n        StandbyStatus: {}",
+                    tmpSme.getResourceName(), tmpSme.getAdminState(), tmpSme.getOpState(), tmpSme.getAvailStatus(),
+                    tmpSme.getStandbyStatus());
+        }
+        logger.debug("\n\n");
+
+        em.refresh(sme1);
+        assertEquals(StateManagement.DISABLED, sme1.getOpState());
+
+        // Now let's add sme2 to the mix
+        updateQuery = em.createQuery(
+                "UPDATE ForwardProgressEntity f " + "SET f.lastUpdated = :newDate " + "WHERE f.resourceName=:resource");
+        updateQuery.setParameter("newDate", staleDate, TemporalType.TIMESTAMP);
+        updateQuery.setParameter("resource", fpe2.getResourceName());
+
+        et = em.getTransaction();
+        et.begin();
+        updateQuery.executeUpdate();
+        et.commit();
+
+        // Give it a chance to write the DB and run the audit
+        logger.debug("IntegrityMonitorTest:testStateAudit: (restart4) Running State Audit");
+        waitStep();
+        im.executeStateAudit();
+        waitStep();
+        logger.debug("IntegrityMonitorTest:testStateAudit: (restart4) State Audit complete");
+
+        // Now check its state
+        logger.debug(
+                "\nIntegrityMonitorTest:testStateAudit (restart4) getting list of StateManagementEntity entries\n\n");
+        smeList = query.getResultList();
+
+        logger.debug("\n\n");
+        logger.debug("IntegrityMonitorTest:testStateAudit:StateManagementEntity (restart4) entries");
+        for (Object mySme : smeList) {
+            StateManagementEntity tmpSme = (StateManagementEntity) mySme;
+            em.refresh(tmpSme);
+
+            logger.debug(
+                    "\n    (restart4) ResourceName: {}" + "\n        AdminState: {}" + "\n        OpState: {}"
+                            + "\n        AvailStatus: {}" + "\n        StandbyStatus: {}",
+                    tmpSme.getResourceName(), tmpSme.getAdminState(), tmpSme.getOpState(), tmpSme.getAvailStatus(),
+                    tmpSme.getStandbyStatus());
+        }
+        logger.debug("\n\n");
+
+        em.refresh(sme1);
+        assertEquals(StateManagement.DISABLED, sme1.getOpState());
+
+        em.refresh(sme2);
+        assertEquals(StateManagement.DISABLED, sme2.getOpState());
+
+        logger.debug("\nIntegrityMonitorTest: Exit testStateAudit\n\n");
+        System.out.println("\n\ntestStateAudit: Exit\n\n");
+    }
+
+    private IntegrityMonitor makeMonitor(String resourceName, Properties myProp) throws Exception {
+        IntegrityMonitor.deleteInstance();
+
+        queue = new LinkedBlockingQueue<>();
+
+        IntegrityMonitor im = IntegrityMonitor.getInstance(resourceName, myProp, queue);
+
+        // wait for the monitor thread to start
+        waitStep();
+
+        return im;
+    }
+
+    /**
+     * Waits for the FPManager to complete another cycle.
+     * 
+     * @throws InterruptedException if the thread is interrupted
+     */
+    private void waitStep() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        queue.offer(latch);
+        waitLatch(latch);
+    }
 }
diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTestBase.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTestBase.java
index 84d0b51a..0c8259b7 100644
--- a/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTestBase.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTestBase.java
@@ -39,268 +39,257 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * All JUnits are designed to run in the local development environment where
- * they have write privileges and can execute time-sensitive tasks.
- * <p/>
- * Many of the test verification steps are performed by scanning for items
- * written to the log file. Rather than actually scan the log file, an
- * {@link ExtractAppender} is used to monitor events that are logged and extract
- * relevant items. In order to attach the appender to the debug log, it assumes
- * that the debug log is a <i>logback</i> Logger configured per EELF.
- * <p/>
- * These tests use a temporary, in-memory DB, which is dropped once the tests
- * complete.
+ * All JUnits are designed to run in the local development environment where they have write
+ * privileges and can execute time-sensitive tasks. <p/> Many of the test verification steps are
+ * performed by scanning for items written to the log file. Rather than actually scan the log file,
+ * an {@link ExtractAppender} is used to monitor events that are logged and extract relevant items.
+ * In order to attach the appender to the debug log, it assumes that the debug log is a
+ * <i>logback</i> Logger configured per EELF. <p/> These tests use a temporary, in-memory DB, which
+ * is dropped once the tests complete.
  */
 public class IntegrityMonitorTestBase {
-	private static Logger logger = LoggerFactory.getLogger(IntegrityMonitorTestBase.class);
-
-	/**
-	 * Directory containing the slf4j log files.
-	 */
-	private static final String SLF4J_LOG_DIR = "logs";
-
-	private static final String JMX_PORT_PROP = "com.sun.management.jmxremote.port";
-
-	/**
-	 * Max time, in milliseconds, to wait for a latch to be triggered.
-	 */
-	protected static final long WAIT_MS = 5000l;
-
-	/**
-	 * Milliseconds that monitor should sleep between cycles.
-	 */
-	protected static final long CYCLE_INTERVAL_MS = 2l;
-
-	public static final String DEFAULT_DB_URL_PREFIX = "jdbc:h2:mem:";
-
-	protected static final String dbDriver = "org.h2.Driver";
-	protected static final String dbUser = "testu";
-	protected static final String dbPwd = "testp";
-	protected static final String siteName = "SiteA";
-	protected static final String nodeType = "pap";
-
-	// will be defined by the test *Classes*
-	protected static String dbUrl;
-
-	/**
-	 * Persistence unit.
-	 */
-	protected static final String PERSISTENCE_UNIT = "schemaPU";
-
-	/**
-	 * Properties to be used in all tests.
-	 */
-	protected static Properties properties;
-
-	/**
-	 * Entity manager factory pointing to the in-memory DB for A_SEQ_PU.
-	 */
-	protected static EntityManagerFactory emf;
-
-	/**
-	 * Entity manager factory pointing to the in-memory DB associated with emf.
-	 */
-	protected static EntityManager em;
-
-	/**
-	 * Saved JMX port from system properties, to be restored once all tests
-	 * complete.
-	 */
-	private static Object savedJmxPort;
-
-	/**
-	 * Saved IM persistence unit, to be restored once all tests complete.
-	 */
-	private static String savedPU;
-
-	/**
-	 * Saved monitor cycle interval, to be restored once all tests complete.
-	 */
-	private static long savedCycleIntervalMillis;
-
-	/**
-	 * Saved property time units, to be restored once all tests complete.
-	 */
-	private static TimeUnit savedPropertyUnits;
-
-	/**
-	 * Saves current configuration information and then sets new values.
-	 * 
-	 * @param dbDriver
-	 *            the name of the DB Driver class
-	 * @param dbUrl
-	 *            the URL to the DB
-	 * @throws IOException
-	 * @throws Exception
-	 */
-	protected static void setUpBeforeClass(String dbUrl) throws IOException {
-		logger.info("setup");
-
-		Properties systemProps = System.getProperties();
-
-		// truncate the logs
-		new FileOutputStream(SLF4J_LOG_DIR + "/audit.log").close();
-		new FileOutputStream(SLF4J_LOG_DIR + "/debug.log").close();
-		new FileOutputStream(SLF4J_LOG_DIR + "/error.log").close();
-		new FileOutputStream(SLF4J_LOG_DIR + "/metrics.log").close();
-
-		IntegrityMonitorTestBase.dbUrl = dbUrl;
-
-		// save data that we have to restore at the end of the test
-		savedJmxPort = systemProps.get(JMX_PORT_PROP);
-		savedPU = IntegrityMonitor.getPersistenceUnit();
-		savedCycleIntervalMillis = IntegrityMonitor.getCycleIntervalMillis();
-		savedPropertyUnits = IntegrityMonitor.getPropertyUnits();
-
-		systemProps.put(JMX_PORT_PROP, "9797");
-
-		IntegrityMonitor.setPersistenceUnit(PERSISTENCE_UNIT);
-		IntegrityMonitor.setCycleIntervalMillis(CYCLE_INTERVAL_MS);
-		IntegrityMonitor.setPropertyUnits(TimeUnit.MILLISECONDS);
-
-		IntegrityMonitor.setUnitTesting(true);
-
-		properties = new Properties();
-		properties.put(IntegrityMonitorProperties.DB_DRIVER, dbDriver);
-		properties.put(IntegrityMonitorProperties.DB_URL, dbUrl);
-		properties.put(IntegrityMonitorProperties.DB_USER, dbUser);
-		properties.put(IntegrityMonitorProperties.DB_PWD, dbPwd);
-		properties.put(IntegrityMonitorProperties.SITE_NAME, siteName);
-		properties.put(IntegrityMonitorProperties.NODE_TYPE, nodeType);
-		properties.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS,
-				String.valueOf(100L * CYCLE_INTERVAL_MS));
-
-		emf = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT, makeProperties());
-
-		// keep this open so the in-memory DB stays around until all tests are
-		// done
-		em = emf.createEntityManager();
-
-		stopMonitor();
-	}
-
-	/**
-	 * Restores the configuration to what it was before the test.
-	 */
-	protected static void tearDownAfterClass() {
-		Properties systemProps = System.getProperties();
-		if (savedJmxPort == null) {
-			systemProps.remove(JMX_PORT_PROP);
-
-		} else {
-			systemProps.put(JMX_PORT_PROP, savedJmxPort);
-		}
-
-		IntegrityMonitor.setPersistenceUnit(savedPU);
-		IntegrityMonitor.setCycleIntervalMillis(savedCycleIntervalMillis);
-		IntegrityMonitor.setPropertyUnits(savedPropertyUnits);
-
-		IntegrityMonitor.setUnitTesting(false);
-
-		// this should result in the in-memory DB being deleted
-		em.close();
-		emf.close();
-	}
-
-	/**
-	 * Sets up for a test, which includes deleting all records from the
-	 * IntegrityAuditEntity table.
-	 */
-	protected void setUpTest() {
-
-		// Clean up the DB
-		try (EntityTransCloser et = new EntityTransCloser(em.getTransaction())) {
-
-			em.createQuery("Delete from StateManagementEntity").executeUpdate();
-			em.createQuery("Delete from ForwardProgressEntity").executeUpdate();
-			em.createQuery("Delete from ResourceRegistrationEntity").executeUpdate();
-
-			// commit transaction
-			et.commit();
-		}
-	}
-
-	/**
-	 * Cleans up after a test, removing any ExtractAppenders from the logger and
-	 * stopping any AuditThreads.
-	 */
-	protected void tearDownTest() {
-		stopMonitor();
-	}
-
-	/**
-	 * Stops the IntegrityMonitor instance.
-	 */
-	private static void stopMonitor() {
-		try {
-			IntegrityMonitor.deleteInstance();
-
-		} catch (IntegrityMonitorException e) {
-			// no need to log, as exception was already logged
-		}
-	}
-
-	/**
-	 * Makes a new Property set that's a clone of {@link #properties}.
-	 * 
-	 * @return a new Property set containing all of a copy of all of the
-	 *         {@link #properties}
-	 */
-	protected static Properties makeProperties() {
-		Properties props = new Properties();
-		props.putAll(properties);
-		return props;
-	}
-
-	/**
-	 * Waits for a latch to reach zero.
-	 * 
-	 * @param latch
-	 * @throws InterruptedException
-	 * @throws AssertionError
-	 *             if the latch did not reach zero in the allotted time
-	 */
-	protected void waitLatch(CountDownLatch latch) throws InterruptedException {
-		assertTrue(latch.await(WAIT_MS, TimeUnit.SECONDS));
-	}
-
-	/**
-	 * Applies a function on an object, expecting it to succeed. Catches any
-	 * exceptions thrown by the function.
-	 * 
-	 * @param arg
-	 * @param func
-	 * @throws AssertionError
-	 */
-	protected <T> void assertNoException(T arg, VoidFunction<T> func) {
-		try {
-			func.apply(arg);
-
-		} catch (Exception e) {
-			System.out.println("startTransaction exception: " + e);
-			fail("action failed");
-		}
-	}
-
-	/**
-	 * Applies a function on an object, expecting it to fail. Catches any
-	 * exceptions thrown by the function.
-	 * 
-	 * @param arg
-	 * @param func
-	 * @throws AssertionError
-	 */
-	protected <T> void assertException(T arg, VoidFunction<T> func) {
-		try {
-			func.apply(arg);
-			fail("missing exception");
-		} catch (Exception e) {
-			System.out.println("action found expected exception: " + e);
-		}
-	}
-
-	@FunctionalInterface
-	protected static interface VoidFunction<T> {
-		public void apply(T arg) throws Exception;
-	}
+    private static Logger logger = LoggerFactory.getLogger(IntegrityMonitorTestBase.class);
+
+    /**
+     * Directory containing the slf4j log files.
+     */
+    private static final String SLF4J_LOG_DIR = "logs";
+
+    private static final String JMX_PORT_PROP = "com.sun.management.jmxremote.port";
+
+    /**
+     * Max time, in milliseconds, to wait for a latch to be triggered.
+     */
+    protected static final long WAIT_MS = 5000L;
+
+    /**
+     * Milliseconds that monitor should sleep between cycles.
+     */
+    protected static final long CYCLE_INTERVAL_MS = 2L;
+
+    public static final String DEFAULT_DB_URL_PREFIX = "jdbc:h2:mem:";
+
+    protected static final String dbDriver = "org.h2.Driver";
+    protected static final String dbUser = "testu";
+    protected static final String dbPwd = "testp";
+    protected static final String siteName = "SiteA";
+    protected static final String nodeType = "pap";
+
+    // will be defined by the test *Classes*
+    protected static String dbUrl;
+
+    /**
+     * Persistence unit.
+     */
+    protected static final String PERSISTENCE_UNIT = "schemaPU";
+
+    /**
+     * Properties to be used in all tests.
+     */
+    protected static Properties properties;
+
+    /**
+     * Entity manager factory pointing to the in-memory DB for A_SEQ_PU.
+     */
+    protected static EntityManagerFactory emf;
+
+    /**
+     * Entity manager factory pointing to the in-memory DB associated with emf.
+     */
+    protected static EntityManager em;
+
+    /**
+     * Saved JMX port from system properties, to be restored once all tests complete.
+     */
+    private static Object savedJmxPort;
+
+    /**
+     * Saved IM persistence unit, to be restored once all tests complete.
+     */
+    private static String savedPU;
+
+    /**
+     * Saved monitor cycle interval, to be restored once all tests complete.
+     */
+    private static long savedCycleIntervalMillis;
+
+    /**
+     * Saved property time units, to be restored once all tests complete.
+     */
+    private static TimeUnit savedPropertyUnits;
+
+    /**
+     * Saves current configuration information and then sets new values.
+     * 
+     * @param dbDriver the name of the DB Driver class
+     * @param dbUrl the URL to the DB
+     * @throws IOException if an IO error occurs
+     */
+    protected static void setUpBeforeClass(String dbUrl) throws IOException {
+        logger.info("setup");
+
+        final Properties systemProps = System.getProperties();
+
+        // truncate the logs
+        new FileOutputStream(SLF4J_LOG_DIR + "/audit.log").close();
+        new FileOutputStream(SLF4J_LOG_DIR + "/debug.log").close();
+        new FileOutputStream(SLF4J_LOG_DIR + "/error.log").close();
+        new FileOutputStream(SLF4J_LOG_DIR + "/metrics.log").close();
+
+        IntegrityMonitorTestBase.dbUrl = dbUrl;
+
+        // save data that we have to restore at the end of the test
+        savedJmxPort = systemProps.get(JMX_PORT_PROP);
+        savedPU = IntegrityMonitor.getPersistenceUnit();
+        savedCycleIntervalMillis = IntegrityMonitor.getCycleIntervalMillis();
+        savedPropertyUnits = IntegrityMonitor.getPropertyUnits();
+
+        systemProps.put(JMX_PORT_PROP, "9797");
+
+        IntegrityMonitor.setPersistenceUnit(PERSISTENCE_UNIT);
+        IntegrityMonitor.setCycleIntervalMillis(CYCLE_INTERVAL_MS);
+        IntegrityMonitor.setPropertyUnits(TimeUnit.MILLISECONDS);
+
+        IntegrityMonitor.setUnitTesting(true);
+
+        properties = new Properties();
+        properties.put(IntegrityMonitorProperties.DB_DRIVER, dbDriver);
+        properties.put(IntegrityMonitorProperties.DB_URL, dbUrl);
+        properties.put(IntegrityMonitorProperties.DB_USER, dbUser);
+        properties.put(IntegrityMonitorProperties.DB_PWD, dbPwd);
+        properties.put(IntegrityMonitorProperties.SITE_NAME, siteName);
+        properties.put(IntegrityMonitorProperties.NODE_TYPE, nodeType);
+        properties.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS,
+                String.valueOf(100L * CYCLE_INTERVAL_MS));
+
+        emf = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT, makeProperties());
+
+        // keep this open so the in-memory DB stays around until all tests are
+        // done
+        em = emf.createEntityManager();
+
+        stopMonitor();
+    }
+
+    /**
+     * Restores the configuration to what it was before the test.
+     */
+    protected static void tearDownAfterClass() {
+        Properties systemProps = System.getProperties();
+        if (savedJmxPort == null) {
+            systemProps.remove(JMX_PORT_PROP);
+
+        } else {
+            systemProps.put(JMX_PORT_PROP, savedJmxPort);
+        }
+
+        IntegrityMonitor.setPersistenceUnit(savedPU);
+        IntegrityMonitor.setCycleIntervalMillis(savedCycleIntervalMillis);
+        IntegrityMonitor.setPropertyUnits(savedPropertyUnits);
+
+        IntegrityMonitor.setUnitTesting(false);
+
+        // this should result in the in-memory DB being deleted
+        em.close();
+        emf.close();
+    }
+
+    /**
+     * Sets up for a test, which includes deleting all records from the IntegrityAuditEntity table.
+     */
+    protected void setUpTest() {
+
+        // Clean up the DB
+        try (EntityTransCloser et = new EntityTransCloser(em.getTransaction())) {
+
+            em.createQuery("Delete from StateManagementEntity").executeUpdate();
+            em.createQuery("Delete from ForwardProgressEntity").executeUpdate();
+            em.createQuery("Delete from ResourceRegistrationEntity").executeUpdate();
+
+            // commit transaction
+            et.commit();
+        }
+    }
+
+    /**
+     * Cleans up after a test, removing any ExtractAppenders from the logger and stopping any
+     * AuditThreads.
+     */
+    protected void tearDownTest() {
+        stopMonitor();
+    }
+
+    /**
+     * Stops the IntegrityMonitor instance.
+     */
+    private static void stopMonitor() {
+        try {
+            IntegrityMonitor.deleteInstance();
+
+        } catch (IntegrityMonitorException e) {
+            // no need to log, as exception was already logged
+        }
+    }
+
+    /**
+     * Makes a new Property set that's a clone of {@link #properties}.
+     * 
+     * @return a new Property set containing all of a copy of all of the {@link #properties}
+     */
+    protected static Properties makeProperties() {
+        Properties props = new Properties();
+        props.putAll(properties);
+        return props;
+    }
+
+    /**
+     * Waits for a latch to reach zero.
+     * 
+     * @param latch the latch
+     * @throws InterruptedException if the thread is interrupted
+     * @throws AssertionError if the latch did not reach zero in the allotted time
+     */
+    protected void waitLatch(CountDownLatch latch) throws InterruptedException {
+        assertTrue(latch.await(WAIT_MS, TimeUnit.SECONDS));
+    }
+
+    /**
+     * Applies a function on an object, expecting it to succeed. Catches any exceptions thrown by
+     * the function.
+     * 
+     * @param arg the object to apply the function on
+     * @param func the function
+     * @throws AssertionError if an exception is thrown by the function
+     */
+    protected <T> void assertNoException(T arg, VoidFunction<T> func) {
+        try {
+            func.apply(arg);
+
+        } catch (Exception e) {
+            System.out.println("startTransaction exception: " + e);
+            fail("action failed");
+        }
+    }
+
+    /**
+     * Applies a function on an object, expecting it to fail. Catches any exceptions thrown by the
+     * function.
+     * 
+     * @param arg the object to apply the function on
+     * @param func the function
+     * @throws AssertionError if no exception is thrown by the function
+     */
+    protected <T> void assertException(T arg, VoidFunction<T> func) {
+        try {
+            func.apply(arg);
+            fail("missing exception");
+        } catch (Exception e) {
+            System.out.println("action found expected exception: " + e);
+        }
+    }
+
+    @FunctionalInterface
+    protected static interface VoidFunction<T> {
+        public void apply(T arg) throws Exception;
+    }
 }
diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/StateManagementEntityTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/StateManagementEntityTest.java
index 44faa58f..d098af99 100644
--- a/integrity-monitor/src/test/java/org/onap/policy/common/im/StateManagementEntityTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/StateManagementEntityTest.java
@@ -37,94 +37,107 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class StateManagementEntityTest extends IntegrityMonitorTestBase {
-	private static Logger logger = LoggerFactory.getLogger(StateManagementEntityTest.class);
-	  
-	@BeforeClass
-	public static void setUpClass() throws Exception {
-		IntegrityMonitorTestBase.setUpBeforeClass(DEFAULT_DB_URL_PREFIX + StateManagementEntityTest.class.getSimpleName());
-
-	}
-
-	@AfterClass
-	public static void tearDownClass() throws Exception {
-		IntegrityMonitorTestBase.tearDownAfterClass();
-	}
-
-	@Before
-	public void setUp() {
-		super.setUpTest();
-	}
-
-	@After
-	public void tearDown() {
-		super.tearDownTest();
-	}
-
-	@Test
-	public void testJPA() throws Exception {
-		logger.debug("\n??? logger.infor StateManagementEntityTest: Entering\n\n");
-		
-		//Define the resourceName for the StateManagement constructor
-		String resourceName = "test_resource1";
-		
-		//
-		logger.debug("Create StateManagementEntity, resourceName: {}", resourceName);
-		logger.debug("??? instantiate StateManagementEntity object");
-		StateManagementEntity sme = new StateManagementEntity(); 
-		
-		logger.debug("??? setResourceName : {}", resourceName);
-		sme.setResourceName(resourceName);
-		logger.debug("??? getResourceName : {}", sme.getResourceName());
-
-		sme.setAdminState(StateManagement.UNLOCKED);
-		assertEquals(StateManagement.UNLOCKED, sme.getAdminState());
-		
-		sme.setOpState(StateManagement.ENABLED);
-		assertEquals(StateManagement.ENABLED, sme.getOpState());
-		
-		sme.setAvailStatus(StateManagement.NULL_VALUE);
-		assertEquals(StateManagement.NULL_VALUE, sme.getAvailStatus());
-		
-		sme.setStandbyStatus(StateManagement.COLD_STANDBY);
-		assertEquals(StateManagement.COLD_STANDBY, sme.getStandbyStatus());
-
-		try(EntityTransCloser et = new EntityTransCloser(em.getTransaction())) {
-			logger.debug("??? before persist");
-			em.persist(sme); 
-			logger.debug("??? after  persist");
-			
-			em.flush(); 
-			logger.debug("??? after flush");
-
-			et.commit(); 
-			logger.debug("??? after commit");
-		}
-		
-		try {
-	        Query query = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource");
-	       
-	        query.setParameter("resource", resourceName);
-	       
-	        //Just test that we are retrieving the right object
-	        @SuppressWarnings("rawtypes")
-	        List resourceList = query.getResultList();
-	        if (!resourceList.isEmpty()) {
-	           // exist 
-	           StateManagementEntity sme2 = (StateManagementEntity) resourceList.get(0);	       	   		
-	       	   
-	       	   assertEquals(sme.getResourceName(), sme2.getResourceName()); 
-	       	   assertEquals(sme.getAdminState(), sme2.getAdminState()); 
-	       	   assertEquals(sme.getOpState(), sme2.getOpState()); 
-	       	   assertEquals(sme.getAvailStatus(), sme2.getAvailStatus()); 
-	       	   assertEquals(sme.getStandbyStatus(), sme2.getStandbyStatus()); 
-			   logger.debug("--");
-	        } else {
-	           logger.debug("Record not found, resourceName: {}", resourceName);
-	        }
-		  } catch(Exception ex) {
-			logger.error("Exception on select query: " + ex.toString());
-	    }
-		
-		logger.debug("\n\nJpaTest: Exit\n\n");
-	}
+    private static Logger logger = LoggerFactory.getLogger(StateManagementEntityTest.class);
+
+    /**
+     * Set up for the test class.
+     */
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IntegrityMonitorTestBase
+                .setUpBeforeClass(DEFAULT_DB_URL_PREFIX + StateManagementEntityTest.class.getSimpleName());
+
+    }
+
+    /**
+     * Tear down after the test class.
+     */
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        IntegrityMonitorTestBase.tearDownAfterClass();
+    }
+
+    /**
+     * Set up for the test cases.
+     */
+    @Before
+    public void setUp() {
+        super.setUpTest();
+    }
+
+    /**
+     * Tear down after the test cases.
+     */
+    @After
+    public void tearDown() {
+        super.tearDownTest();
+    }
+
+    @Test
+    public void testJpa() throws Exception {
+        logger.debug("\n??? logger.infor StateManagementEntityTest: Entering\n\n");
+
+        // Define the resourceName for the StateManagement constructor
+        String resourceName = "test_resource1";
+
+        //
+        logger.debug("Create StateManagementEntity, resourceName: {}", resourceName);
+        logger.debug("??? instantiate StateManagementEntity object");
+        StateManagementEntity sme = new StateManagementEntity();
+
+        logger.debug("??? setResourceName : {}", resourceName);
+        sme.setResourceName(resourceName);
+        logger.debug("??? getResourceName : {}", sme.getResourceName());
+
+        sme.setAdminState(StateManagement.UNLOCKED);
+        assertEquals(StateManagement.UNLOCKED, sme.getAdminState());
+
+        sme.setOpState(StateManagement.ENABLED);
+        assertEquals(StateManagement.ENABLED, sme.getOpState());
+
+        sme.setAvailStatus(StateManagement.NULL_VALUE);
+        assertEquals(StateManagement.NULL_VALUE, sme.getAvailStatus());
+
+        sme.setStandbyStatus(StateManagement.COLD_STANDBY);
+        assertEquals(StateManagement.COLD_STANDBY, sme.getStandbyStatus());
+
+        try (EntityTransCloser et = new EntityTransCloser(em.getTransaction())) {
+            logger.debug("??? before persist");
+            em.persist(sme);
+            logger.debug("??? after  persist");
+
+            em.flush();
+            logger.debug("??? after flush");
+
+            et.commit();
+            logger.debug("??? after commit");
+        }
+
+        try {
+            Query query = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource");
+
+            query.setParameter("resource", resourceName);
+
+            // Just test that we are retrieving the right object
+            @SuppressWarnings("rawtypes")
+            List resourceList = query.getResultList();
+            if (!resourceList.isEmpty()) {
+                // exist
+                StateManagementEntity sme2 = (StateManagementEntity) resourceList.get(0);
+
+                assertEquals(sme.getResourceName(), sme2.getResourceName());
+                assertEquals(sme.getAdminState(), sme2.getAdminState());
+                assertEquals(sme.getOpState(), sme2.getOpState());
+                assertEquals(sme.getAvailStatus(), sme2.getAvailStatus());
+                assertEquals(sme.getStandbyStatus(), sme2.getStandbyStatus());
+                logger.debug("--");
+            } else {
+                logger.debug("Record not found, resourceName: {}", resourceName);
+            }
+        } catch (Exception ex) {
+            logger.error("Exception on select query: " + ex.toString());
+        }
+
+        logger.debug("\n\nJpaTest: Exit\n\n");
+    }
 }
diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/StateManagementTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/StateManagementTest.java
index 377fed91..1d0d34ea 100644
--- a/integrity-monitor/src/test/java/org/onap/policy/common/im/StateManagementTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/StateManagementTest.java
@@ -26,12 +26,14 @@ import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.PersistenceException;
 import javax.persistence.QueryTimeoutException;
 import javax.persistence.TypedQuery;
+
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -226,7 +228,7 @@ public class StateManagementTest extends IntegrityMonitorTestBase {
 
     @Test(expected = StateManagementException.class)
     @SuppressWarnings("unchecked")
-    public void test_StateManagementInitialization_ThrowStateManagementException_ifEntityManagerCreateQuerythrowsAnyException()
+    public void test_StateManagementInitialization_ThrowException_ifEntityManagerCreateQuerythrowsAnyException()
             throws Exception {
         final EntityManager mockedEm = getMockedEntityManager();
         final EntityManagerFactory mockedEmf = getMockedEntityManagerFactory(mockedEm);
diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/StateTransitionTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/StateTransitionTest.java
index 177a4489..ff7cc3bd 100644
--- a/integrity-monitor/src/test/java/org/onap/policy/common/im/StateTransitionTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/StateTransitionTest.java
@@ -29,2132 +29,2143 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 /*
  * All JUnits are designed to run in the local development environment
  * where they have write privileges and can execute time-sensitive
  * tasks.
  */
 public class StateTransitionTest {
-	private static Logger logger = LoggerFactory.getLogger(StateTransitionTest.class);
-	  
-	@BeforeClass
-	public static void setUpClass() throws Exception {
-
-	}
-
-	@AfterClass
-	public static void tearDownClass() throws Exception {
-	}
-
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-	@Test
-	public void test() throws Exception {
-		logger.info("\n\nlogger.infor StateTransitionTest: Entering\n\n");
-		try {
-		    logger.info("??? create a new StateTransition"); 
-		    StateTransition st = new StateTransition();
- 
-		    StateElement se = null; 
-		    try {
-		    	// bad test case 
-		    	se = st.getEndingState("unlocked", "enabled", "null",  "coldstandby", "lock");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
-		        
-		        logger.info("??? StateTransition testcase 1");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "null", "lock");
-				assertEquals("null,locked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 2");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "null", "unlock");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 3");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "null", "disableFailed");
-				assertEquals("null,unlocked,disabled,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 4");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "null", "enableNotFailed");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 5");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "null", "disableDependency");
-				assertEquals("null,unlocked,disabled,dependency,", makeString(se));
-                
-		        logger.info("??? StateTransition testcase 6");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "null", "enableNoDependency");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 7");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "null", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 8");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "null", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 9");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "coldstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 10");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "coldstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 11");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 12");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "coldstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 13");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 14");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "coldstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 15");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "coldstandby", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 16");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "coldstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 17");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "hotstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 18");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "hotstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 19");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 20");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "hotstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 21");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 22");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "hotstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 23");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "hotstandby", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 24");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "hotstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 25");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "providingservice", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 26");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "providingservice", "unlock");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 27");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 28");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "providingservice", "enableNotFailed");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
-		    	
-		        logger.info("??? StateTransition testcase 29");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 30");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "providingservice", "enableNoDependency");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 31");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "providingservice", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+    private static Logger logger = LoggerFactory.getLogger(StateTransitionTest.class);
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {}
+
+    @Before
+    public void setUp() throws Exception {}
+
+    @After
+    public void tearDown() throws Exception {}
 
-		        logger.info("??? StateTransition testcase 32");
-		        se = st.getEndingState("unlocked", "enabled", "null",  "providingservice", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+    @Test
+    public void test() throws Exception {
+        logger.info("\n\nlogger.infor StateTransitionTest: Entering\n\n");
+        try {
+            logger.info("??? create a new StateTransition");
+            StateTransition st = new StateTransition();
 
-		        logger.info("??? StateTransition testcase 33");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "null", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+            StateElement se = null;
+            try {
+                // bad test case
+                se = st.getEndingState("unlocked", "enabled", "null", "coldstandby", "lock");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 34");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "null", "unlock");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 1");
+                se = st.getEndingState("unlocked", "enabled", "null", "null", "lock");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 35");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "null", "disableFailed");
-				assertEquals("null,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 2");
+                se = st.getEndingState("unlocked", "enabled", "null", "null", "unlock");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 36");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "null", "enableNotFailed");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 3");
+                se = st.getEndingState("unlocked", "enabled", "null", "null", "disableFailed");
+                assertEquals("null,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 37");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "null", "disableDependency");
-				assertEquals("null,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 4");
+                se = st.getEndingState("unlocked", "enabled", "null", "null", "enableNotFailed");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 38");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "null", "enableNoDependency");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 5");
+                se = st.getEndingState("unlocked", "enabled", "null", "null", "disableDependency");
+                assertEquals("null,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 39");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "null", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 6");
+                se = st.getEndingState("unlocked", "enabled", "null", "null", "enableNoDependency");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 40");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "null", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 7");
+                se = st.getEndingState("unlocked", "enabled", "null", "null", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 41");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "coldstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 8");
+                se = st.getEndingState("unlocked", "enabled", "null", "null", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 42");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "coldstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 9");
+                se = st.getEndingState("unlocked", "enabled", "null", "coldstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 43");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 10");
+                se = st.getEndingState("unlocked", "enabled", "null", "coldstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 44");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "coldstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 11");
+                se = st.getEndingState("unlocked", "enabled", "null", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 45");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 12");
+                se = st.getEndingState("unlocked", "enabled", "null", "coldstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 46");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "coldstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 13");
+                se = st.getEndingState("unlocked", "enabled", "null", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 47");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "coldstandby", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 14");
+                se = st.getEndingState("unlocked", "enabled", "null", "coldstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 48");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "coldstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 15");
+                se = st.getEndingState("unlocked", "enabled", "null", "coldstandby", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 49");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "hotstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 16");
+                se = st.getEndingState("unlocked", "enabled", "null", "coldstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 50");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "hotstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 17");
+                se = st.getEndingState("unlocked", "enabled", "null", "hotstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 51");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 18");
+                se = st.getEndingState("unlocked", "enabled", "null", "hotstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 52");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "hotstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 19");
+                se = st.getEndingState("unlocked", "enabled", "null", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 53");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 20");
+                se = st.getEndingState("unlocked", "enabled", "null", "hotstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 54");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "hotstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 21");
+                se = st.getEndingState("unlocked", "enabled", "null", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 55");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "hotstandby", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 22");
+                se = st.getEndingState("unlocked", "enabled", "null", "hotstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+
+                logger.info("??? StateTransition testcase 23");
+                se = st.getEndingState("unlocked", "enabled", "null", "hotstandby", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 56");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "hotstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 24");
+                se = st.getEndingState("unlocked", "enabled", "null", "hotstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 57");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "providingservice", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 25");
+                se = st.getEndingState("unlocked", "enabled", "null", "providingservice", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 58");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "providingservice", "unlock");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 26");
+                se = st.getEndingState("unlocked", "enabled", "null", "providingservice", "unlock");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 59");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 27");
+                se = st.getEndingState("unlocked", "enabled", "null", "providingservice", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 60");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "providingservice", "enableNotFailed");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 28");
+                se = st.getEndingState("unlocked", "enabled", "null", "providingservice", "enableNotFailed");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 61");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 29");
+                se = st.getEndingState("unlocked", "enabled", "null", "providingservice", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 62");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "providingservice", "enableNoDependency");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 30");
+                se = st.getEndingState("unlocked", "enabled", "null", "providingservice", "enableNoDependency");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 63");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "providingservice", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 31");
+                se = st.getEndingState("unlocked", "enabled", "null", "providingservice", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 64");
-		        se = st.getEndingState("unlocked", "enabled", "failed",  "providingservice", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 32");
+                se = st.getEndingState("unlocked", "enabled", "null", "providingservice", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 65");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "null", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 33");
+                se = st.getEndingState("unlocked", "enabled", "failed", "null", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 66");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "null", "unlock");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 34");
+                se = st.getEndingState("unlocked", "enabled", "failed", "null", "unlock");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 67");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "null", "disableFailed");
-				assertEquals("null,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 35");
+                se = st.getEndingState("unlocked", "enabled", "failed", "null", "disableFailed");
+                assertEquals("null,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 68");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "null", "enableNotFailed");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 36");
+                se = st.getEndingState("unlocked", "enabled", "failed", "null", "enableNotFailed");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 69");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "null", "disableDependency");
-				assertEquals("null,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 37");
+                se = st.getEndingState("unlocked", "enabled", "failed", "null", "disableDependency");
+                assertEquals("null,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 70");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "null", "enableNoDependency");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 38");
+                se = st.getEndingState("unlocked", "enabled", "failed", "null", "enableNoDependency");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 71");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "null", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 39");
+                se = st.getEndingState("unlocked", "enabled", "failed", "null", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 72");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "null", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 40");
+                se = st.getEndingState("unlocked", "enabled", "failed", "null", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 73");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "coldstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 41");
+                se = st.getEndingState("unlocked", "enabled", "failed", "coldstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 74");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "coldstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 42");
+                se = st.getEndingState("unlocked", "enabled", "failed", "coldstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 75");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 43");
+                se = st.getEndingState("unlocked", "enabled", "failed", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 76");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "coldstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 44");
+                se = st.getEndingState("unlocked", "enabled", "failed", "coldstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 77");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 45");
+                se = st.getEndingState("unlocked", "enabled", "failed", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 78");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "coldstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 46");
+                se = st.getEndingState("unlocked", "enabled", "failed", "coldstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 79");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "coldstandby", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 47");
+                se = st.getEndingState("unlocked", "enabled", "failed", "coldstandby", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 80");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "coldstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 48");
+                se = st.getEndingState("unlocked", "enabled", "failed", "coldstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 81");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "hotstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 49");
+                se = st.getEndingState("unlocked", "enabled", "failed", "hotstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 82");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "hotstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 50");
+                se = st.getEndingState("unlocked", "enabled", "failed", "hotstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 83");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 51");
+                se = st.getEndingState("unlocked", "enabled", "failed", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 84");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "hotstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 52");
+                se = st.getEndingState("unlocked", "enabled", "failed", "hotstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 85");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "hotstandby", "disableDependency");
-				assertEquals("hotstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 53");
+                se = st.getEndingState("unlocked", "enabled", "failed", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 86");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "hotstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 54");
+                se = st.getEndingState("unlocked", "enabled", "failed", "hotstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 87");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "hotstandby", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 55");
+                se = st.getEndingState("unlocked", "enabled", "failed", "hotstandby", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 88");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "hotstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 56");
+                se = st.getEndingState("unlocked", "enabled", "failed", "hotstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 89");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "providingservice", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 57");
+                se = st.getEndingState("unlocked", "enabled", "failed", "providingservice", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 90");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "providingservice", "unlock");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 58");
+                se = st.getEndingState("unlocked", "enabled", "failed", "providingservice", "unlock");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 91");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 59");
+                se = st.getEndingState("unlocked", "enabled", "failed", "providingservice", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 92");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "providingservice", "enableNotFailed");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 60");
+                se = st.getEndingState("unlocked", "enabled", "failed", "providingservice", "enableNotFailed");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 93");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 61");
+                se = st.getEndingState("unlocked", "enabled", "failed", "providingservice", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 94");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "providingservice", "enableNoDependency");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 62");
+                se = st.getEndingState("unlocked", "enabled", "failed", "providingservice", "enableNoDependency");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 95");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "providingservice", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 63");
+                se = st.getEndingState("unlocked", "enabled", "failed", "providingservice", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 96");
-		        se = st.getEndingState("unlocked", "enabled", "dependency",  "providingservice", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 64");
+                se = st.getEndingState("unlocked", "enabled", "failed", "providingservice", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 97");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "null", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 65");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "null", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 98");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "null", "unlock");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 66");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "null", "unlock");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 99");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "null", "disableFailed");
-				assertEquals("null,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 67");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "null", "disableFailed");
+                assertEquals("null,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 100");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "null", "enableNotFailed");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 68");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "null", "enableNotFailed");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 101");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "null", "disableDependency");
-				assertEquals("null,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 69");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "null", "disableDependency");
+                assertEquals("null,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 102");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "null", "enableNoDependency");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 70");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "null", "enableNoDependency");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 103");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "null", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 71");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "null", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 104");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "null", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 72");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "null", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 105");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "coldstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 73");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "coldstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 106");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "coldstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 74");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "coldstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 107");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 75");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 108");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "coldstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 76");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "coldstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 109");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 77");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 110");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "coldstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 78");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "coldstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 111");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "coldstandby", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 79");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "coldstandby", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 112");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "coldstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 80");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "coldstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 113");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "hotstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 81");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "hotstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 114");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "hotstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 82");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "hotstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 115");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 83");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 116");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "hotstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 84");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "hotstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 117");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 85");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "hotstandby", "disableDependency");
+                assertEquals("hotstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 118");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "hotstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 86");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "hotstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 119");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "hotstandby", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 87");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "hotstandby", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 120");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "hotstandby", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 88");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "hotstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 121");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "providingservice", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 89");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "providingservice", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 122");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "providingservice", "unlock");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 90");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "providingservice", "unlock");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 123");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 91");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "providingservice", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 124");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "providingservice", "enableNotFailed");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 92");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "providingservice", "enableNotFailed");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 125");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 93");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "providingservice", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 126");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "providingservice", "enableNoDependency");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 94");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "providingservice", "enableNoDependency");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 127");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "providingservice", "promote");
-				assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 95");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "providingservice", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 128");
-		        se = st.getEndingState("unlocked", "enabled", "dependency,failed",  "providingservice", "demote");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 96");
+                se = st.getEndingState("unlocked", "enabled", "dependency", "providingservice", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 129");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "null", "demote");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 97");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "null", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 130");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "null", "unlock");
-				assertEquals("null,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 98");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "null", "unlock");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 131");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "null", "disableFailed");
-				assertEquals("null,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 99");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "null", "disableFailed");
+                assertEquals("null,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 132");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "null", "enableNotFailed");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 100");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "null", "enableNotFailed");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 133");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "null", "disableDependency");
-				assertEquals("null,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 101");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "null", "disableDependency");
+                assertEquals("null,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 134");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "null", "enableNoDependency");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 102");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "null", "enableNoDependency");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 135");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "null", "promote");
-				assertEquals("coldstandby,unlocked,disabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 103");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "null", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 136");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "null", "demote");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 104");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "null", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 137");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "coldstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 105");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "coldstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 138");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "coldstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 106");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "coldstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 139");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 107");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 140");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "coldstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 108");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "coldstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 141");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 109");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 142");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "coldstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 110");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "coldstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 143");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "coldstandby", "promote");
-				assertEquals("coldstandby,unlocked,disabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 111");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "coldstandby", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 144");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "coldstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 112");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "coldstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 145");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "hotstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 113");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "hotstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 146");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "hotstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 114");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "hotstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 147");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 115");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 148");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "hotstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 116");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "hotstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 149");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 117");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 150");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "hotstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 118");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "hotstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 151");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "hotstandby", "promote");
-				assertEquals("coldstandby,unlocked,disabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 119");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "hotstandby", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 152");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "hotstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 120");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "hotstandby", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 153");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "providingservice", "demote");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 121");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "providingservice", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 154");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "providingservice", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 122");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "providingservice", "unlock");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 155");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 123");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "providingservice", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 156");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "providingservice", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 124");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "providingservice",
+                        "enableNotFailed");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
+
+                logger.info("??? StateTransition testcase 125");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "providingservice",
+                        "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+
+                logger.info("??? StateTransition testcase 126");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "providingservice",
+                        "enableNoDependency");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 157");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 127");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "providingservice", "promote");
+                assertEquals("providingservice,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 158");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "providingservice", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 128");
+                se = st.getEndingState("unlocked", "enabled", "dependency,failed", "providingservice", "demote");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 159");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "providingservice", "promote");
-				assertEquals("coldstandby,unlocked,disabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 129");
+                se = st.getEndingState("unlocked", "disabled", "null", "null", "demote");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 160");
-		        se = st.getEndingState("unlocked", "disabled", "null",  "providingservice", "demote");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 130");
+                se = st.getEndingState("unlocked", "disabled", "null", "null", "unlock");
+                assertEquals("null,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 161");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "null", "demote");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 131");
+                se = st.getEndingState("unlocked", "disabled", "null", "null", "disableFailed");
+                assertEquals("null,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 162");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "null", "unlock");
-				assertEquals("null,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 132");
+                se = st.getEndingState("unlocked", "disabled", "null", "null", "enableNotFailed");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 163");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "null", "disableFailed");
-				assertEquals("null,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 133");
+                se = st.getEndingState("unlocked", "disabled", "null", "null", "disableDependency");
+                assertEquals("null,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 164");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "null", "enableNotFailed");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 134");
+                se = st.getEndingState("unlocked", "disabled", "null", "null", "enableNoDependency");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 165");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "null", "disableDependency");
-				assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 135");
+                se = st.getEndingState("unlocked", "disabled", "null", "null", "promote");
+                assertEquals("coldstandby,unlocked,disabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 166");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "null", "enableNoDependency");
-				assertEquals("null,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 136");
+                se = st.getEndingState("unlocked", "disabled", "null", "null", "demote");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 167");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "null", "promote");
-				assertEquals("coldstandby,unlocked,disabled,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 137");
+                se = st.getEndingState("unlocked", "disabled", "null", "coldstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 168");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "null", "demote");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 138");
+                se = st.getEndingState("unlocked", "disabled", "null", "coldstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 169");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 139");
+                se = st.getEndingState("unlocked", "disabled", "null", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 170");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "coldstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 140");
+                se = st.getEndingState("unlocked", "disabled", "null", "coldstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 171");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 141");
+                se = st.getEndingState("unlocked", "disabled", "null", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 172");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "coldstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 142");
+                se = st.getEndingState("unlocked", "disabled", "null", "coldstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 173");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 143");
+                se = st.getEndingState("unlocked", "disabled", "null", "coldstandby", "promote");
+                assertEquals("coldstandby,unlocked,disabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 174");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "coldstandby", "enableNoDependency");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 144");
+                se = st.getEndingState("unlocked", "disabled", "null", "coldstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 175");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "coldstandby", "promote");
-				assertEquals("coldstandby,unlocked,disabled,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 145");
+                se = st.getEndingState("unlocked", "disabled", "null", "hotstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 176");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 146");
+                se = st.getEndingState("unlocked", "disabled", "null", "hotstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 177");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 147");
+                se = st.getEndingState("unlocked", "disabled", "null", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 178");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "hotstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 148");
+                se = st.getEndingState("unlocked", "disabled", "null", "hotstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 179");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 149");
+                se = st.getEndingState("unlocked", "disabled", "null", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 180");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "hotstandby", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 150");
+                se = st.getEndingState("unlocked", "disabled", "null", "hotstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 181");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 151");
+                se = st.getEndingState("unlocked", "disabled", "null", "hotstandby", "promote");
+                assertEquals("coldstandby,unlocked,disabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 182");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "hotstandby", "enableNoDependency");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 152");
+                se = st.getEndingState("unlocked", "disabled", "null", "hotstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 183");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "hotstandby", "promote");
-				assertEquals("coldstandby,unlocked,disabled,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 153");
+                se = st.getEndingState("unlocked", "disabled", "null", "providingservice", "demote");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 184");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 154");
+                se = st.getEndingState("unlocked", "disabled", "null", "providingservice", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 185");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "providingservice", "demote");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 155");
+                se = st.getEndingState("unlocked", "disabled", "null", "providingservice", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 186");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "providingservice", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 156");
+                se = st.getEndingState("unlocked", "disabled", "null", "providingservice", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 187");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 157");
+                se = st.getEndingState("unlocked", "disabled", "null", "providingservice", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 188");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "providingservice", "enableNotFailed");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 158");
+                se = st.getEndingState("unlocked", "disabled", "null", "providingservice", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 189");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 159");
+                se = st.getEndingState("unlocked", "disabled", "null", "providingservice", "promote");
+                assertEquals("coldstandby,unlocked,disabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 190");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "providingservice", "enableNoDependency");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 160");
+                se = st.getEndingState("unlocked", "disabled", "null", "providingservice", "demote");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 191");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "providingservice", "promote");
-				assertEquals("coldstandby,unlocked,disabled,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 161");
+                se = st.getEndingState("unlocked", "disabled", "failed", "null", "demote");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 192");
-		        se = st.getEndingState("unlocked", "disabled", "failed",  "providingservice", "demote");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 162");
+                se = st.getEndingState("unlocked", "disabled", "failed", "null", "unlock");
+                assertEquals("null,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 193");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "null", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 163");
+                se = st.getEndingState("unlocked", "disabled", "failed", "null", "disableFailed");
+                assertEquals("null,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 194");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "null", "unlock");
-				assertEquals("null,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 164");
+                se = st.getEndingState("unlocked", "disabled", "failed", "null", "enableNotFailed");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 195");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "null", "disableFailed");
-				assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 165");
+                se = st.getEndingState("unlocked", "disabled", "failed", "null", "disableDependency");
+                assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 196");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "null", "enableNotFailed");
-				assertEquals("null,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 166");
+                se = st.getEndingState("unlocked", "disabled", "failed", "null", "enableNoDependency");
+                assertEquals("null,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 197");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "null", "disableDependency");
-				assertEquals("null,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 167");
+                se = st.getEndingState("unlocked", "disabled", "failed", "null", "promote");
+                assertEquals("coldstandby,unlocked,disabled,failed,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 198");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "null", "enableNoDependency");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 168");
+                se = st.getEndingState("unlocked", "disabled", "failed", "null", "demote");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 199");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "null", "promote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 169");
+                se = st.getEndingState("unlocked", "disabled", "failed", "coldstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 200");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "null", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 170");
+                se = st.getEndingState("unlocked", "disabled", "failed", "coldstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 201");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "coldstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 171");
+                se = st.getEndingState("unlocked", "disabled", "failed", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 202");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "coldstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 172");
+                se = st.getEndingState("unlocked", "disabled", "failed", "coldstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 203");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 173");
+                se = st.getEndingState("unlocked", "disabled", "failed", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 204");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "coldstandby", "enableNotFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 174");
+                se = st.getEndingState("unlocked", "disabled", "failed", "coldstandby", "enableNoDependency");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 205");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 175");
+                se = st.getEndingState("unlocked", "disabled", "failed", "coldstandby", "promote");
+                assertEquals("coldstandby,unlocked,disabled,failed,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 206");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "coldstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 176");
+                se = st.getEndingState("unlocked", "disabled", "failed", "coldstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 207");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "coldstandby", "promote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 177");
+                se = st.getEndingState("unlocked", "disabled", "failed", "hotstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 208");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "coldstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 178");
+                se = st.getEndingState("unlocked", "disabled", "failed", "hotstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 209");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "hotstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 179");
+                se = st.getEndingState("unlocked", "disabled", "failed", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 210");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "hotstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 180");
+                se = st.getEndingState("unlocked", "disabled", "failed", "hotstandby", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 211");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 181");
+                se = st.getEndingState("unlocked", "disabled", "failed", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 212");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "hotstandby", "enableNotFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 182");
+                se = st.getEndingState("unlocked", "disabled", "failed", "hotstandby", "enableNoDependency");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 213");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 183");
+                se = st.getEndingState("unlocked", "disabled", "failed", "hotstandby", "promote");
+                assertEquals("coldstandby,unlocked,disabled,failed,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 214");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "hotstandby", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 184");
+                se = st.getEndingState("unlocked", "disabled", "failed", "hotstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 215");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "hotstandby", "promote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 185");
+                se = st.getEndingState("unlocked", "disabled", "failed", "providingservice", "demote");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 216");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "hotstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 186");
+                se = st.getEndingState("unlocked", "disabled", "failed", "providingservice", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 217");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "providingservice", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 187");
+                se = st.getEndingState("unlocked", "disabled", "failed", "providingservice", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 218");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "providingservice", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 188");
+                se = st.getEndingState("unlocked", "disabled", "failed", "providingservice", "enableNotFailed");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 219");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 189");
+                se = st.getEndingState("unlocked", "disabled", "failed", "providingservice", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 220");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "providingservice", "enableNotFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 190");
+                se = st.getEndingState("unlocked", "disabled", "failed", "providingservice", "enableNoDependency");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 221");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 191");
+                se = st.getEndingState("unlocked", "disabled", "failed", "providingservice", "promote");
+                assertEquals("coldstandby,unlocked,disabled,failed,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 222");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "providingservice", "enableNoDependency");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 192");
+                se = st.getEndingState("unlocked", "disabled", "failed", "providingservice", "demote");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 223");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "providingservice", "promote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 193");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "null", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 224");
-		        se = st.getEndingState("unlocked", "disabled", "dependency",  "providingservice", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 194");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "null", "unlock");
+                assertEquals("null,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 225");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "null", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 195");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "null", "disableFailed");
+                assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 226");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "null", "unlock");
-				assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 196");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "null", "enableNotFailed");
+                assertEquals("null,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 227");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "null", "disableFailed");
-				assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 197");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "null", "disableDependency");
+                assertEquals("null,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 228");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "null", "enableNotFailed");
-				assertEquals("null,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 198");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "null", "enableNoDependency");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 229");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "null", "disableDependency");
-				assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 199");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "null", "promote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 230");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "null", "enableNoDependency");
-				assertEquals("null,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 200");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "null", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 231");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "null", "promote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 201");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "coldstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 232");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "null", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 202");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "coldstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 233");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 203");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 234");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "coldstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 204");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "coldstandby", "enableNotFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 235");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 205");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 236");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "coldstandby", "enableNotFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 206");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "coldstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 237");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 207");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "coldstandby", "promote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 238");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "coldstandby", "enableNoDependency");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 208");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "coldstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 239");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "coldstandby", "promote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 209");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "hotstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 240");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 210");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "hotstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 241");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 211");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 242");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "hotstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 212");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "hotstandby", "enableNotFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 243");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 213");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 244");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "hotstandby", "enableNotFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 214");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "hotstandby", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 245");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 215");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "hotstandby", "promote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 246");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "hotstandby", "enableNoDependency");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 216");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "hotstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 247");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "hotstandby", "promote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 217");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "providingservice", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 248");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 218");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "providingservice", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 249");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "providingservice", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 219");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "providingservice", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 250");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "providingservice", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 220");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "providingservice", "enableNotFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 251");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 221");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "providingservice", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 252");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "providingservice", "enableNotFailed");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 222");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "providingservice", "enableNoDependency");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 253");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 223");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "providingservice", "promote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 254");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "providingservice", "enableNoDependency");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 224");
+                se = st.getEndingState("unlocked", "disabled", "dependency", "providingservice", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 255");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "providingservice", "promote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 225");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "null", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 256");
-		        se = st.getEndingState("unlocked", "disabled", "dependency,failed",  "providingservice", "demote");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 226");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "null", "unlock");
+                assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 257");
-		        se = st.getEndingState("locked", "enabled", "null",  "null", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 227");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "null", "disableFailed");
+                assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 258");
-		        se = st.getEndingState("locked", "enabled", "null",  "null", "unlock");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 228");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "null", "enableNotFailed");
+                assertEquals("null,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 259");
-		        se = st.getEndingState("locked", "enabled", "null",  "null", "disableFailed");
-				assertEquals("null,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 229");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "null", "disableDependency");
+                assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 260");
-		        se = st.getEndingState("locked", "enabled", "null",  "null", "enableNotFailed");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 230");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "null", "enableNoDependency");
+                assertEquals("null,unlocked,disabled,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 231");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "null", "promote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+
+                logger.info("??? StateTransition testcase 232");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "null", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 233");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "coldstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 234");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "coldstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 235");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 236");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "coldstandby", "enableNotFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+
+                logger.info("??? StateTransition testcase 237");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 238");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "coldstandby",
+                        "enableNoDependency");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 239");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "coldstandby", "promote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+
+                logger.info("??? StateTransition testcase 240");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "coldstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 241");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "hotstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 242");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "hotstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 243");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 244");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "hotstandby", "enableNotFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+
+                logger.info("??? StateTransition testcase 245");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 246");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "hotstandby", "enableNoDependency");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 247");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "hotstandby", "promote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+
+                logger.info("??? StateTransition testcase 248");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "hotstandby", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 249");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "providingservice", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 250");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "providingservice", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 251");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "providingservice",
+                        "disableFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 252");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "providingservice",
+                        "enableNotFailed");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+
+                logger.info("??? StateTransition testcase 253");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "providingservice",
+                        "disableDependency");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 254");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "providingservice",
+                        "enableNoDependency");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 255");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "providingservice", "promote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+
+                logger.info("??? StateTransition testcase 256");
+                se = st.getEndingState("unlocked", "disabled", "dependency,failed", "providingservice", "demote");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 257");
+                se = st.getEndingState("locked", "enabled", "null", "null", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+
+                logger.info("??? StateTransition testcase 258");
+                se = st.getEndingState("locked", "enabled", "null", "null", "unlock");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
+
+                logger.info("??? StateTransition testcase 259");
+                se = st.getEndingState("locked", "enabled", "null", "null", "disableFailed");
+                assertEquals("null,locked,disabled,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 260");
+                se = st.getEndingState("locked", "enabled", "null", "null", "enableNotFailed");
+                assertEquals("null,locked,enabled,null,", makeString(se));
+
+                logger.info("??? StateTransition testcase 261");
+                se = st.getEndingState("locked", "enabled", "null", "null", "disableDependency");
+                assertEquals("null,locked,disabled,dependency,", makeString(se));
+
+                logger.info("??? StateTransition testcase 262");
+                se = st.getEndingState("locked", "enabled", "null", "null", "enableNoDependency");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 261");
-		        se = st.getEndingState("locked", "enabled", "null",  "null", "disableDependency");
-				assertEquals("null,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 263");
+                se = st.getEndingState("locked", "enabled", "null", "null", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 262");
-		        se = st.getEndingState("locked", "enabled", "null",  "null", "enableNoDependency");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 264");
+                se = st.getEndingState("locked", "enabled", "null", "null", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 263");
-		        se = st.getEndingState("locked", "enabled", "null",  "null", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 265");
+                se = st.getEndingState("locked", "enabled", "null", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 264");
-		        se = st.getEndingState("locked", "enabled", "null",  "null", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 266");
+                se = st.getEndingState("locked", "enabled", "null", "coldstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 265");
-		        se = st.getEndingState("locked", "enabled", "null",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 267");
+                se = st.getEndingState("locked", "enabled", "null", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 266");
-		        se = st.getEndingState("locked", "enabled", "null",  "coldstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 268");
+                se = st.getEndingState("locked", "enabled", "null", "coldstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 267");
-		        se = st.getEndingState("locked", "enabled", "null",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 269");
+                se = st.getEndingState("locked", "enabled", "null", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 268");
-		        se = st.getEndingState("locked", "enabled", "null",  "coldstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 270");
+                se = st.getEndingState("locked", "enabled", "null", "coldstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 269");
-		        se = st.getEndingState("locked", "enabled", "null",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 271");
+                se = st.getEndingState("locked", "enabled", "null", "coldstandby", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 270");
-		        se = st.getEndingState("locked", "enabled", "null",  "coldstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 272");
+                se = st.getEndingState("locked", "enabled", "null", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 271");
-		        se = st.getEndingState("locked", "enabled", "null",  "coldstandby", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 273");
+                se = st.getEndingState("locked", "enabled", "null", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 272");
-		        se = st.getEndingState("locked", "enabled", "null",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 274");
+                se = st.getEndingState("locked", "enabled", "null", "hotstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 273");
-		        se = st.getEndingState("locked", "enabled", "null",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 275");
+                se = st.getEndingState("locked", "enabled", "null", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 274");
-		        se = st.getEndingState("locked", "enabled", "null",  "hotstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 276");
+                se = st.getEndingState("locked", "enabled", "null", "hotstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 275");
-		        se = st.getEndingState("locked", "enabled", "null",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 277");
+                se = st.getEndingState("locked", "enabled", "null", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 276");
-		        se = st.getEndingState("locked", "enabled", "null",  "hotstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 278");
+                se = st.getEndingState("locked", "enabled", "null", "hotstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 277");
-		        se = st.getEndingState("locked", "enabled", "null",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 279");
+                se = st.getEndingState("locked", "enabled", "null", "hotstandby", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStateException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 278");
-		        se = st.getEndingState("locked", "enabled", "null",  "hotstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 280");
+                se = st.getEndingState("locked", "enabled", "null", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 279");
-		        se = st.getEndingState("locked", "enabled", "null",  "hotstandby", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStateException", makeString(se));
+                logger.info("??? StateTransition testcase 281");
+                se = st.getEndingState("locked", "enabled", "null", "providingservice", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 280");
-		        se = st.getEndingState("locked", "enabled", "null",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 282");
+                se = st.getEndingState("locked", "enabled", "null", "providingservice", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 281");
-		        se = st.getEndingState("locked", "enabled", "null",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 283");
+                se = st.getEndingState("locked", "enabled", "null", "providingservice", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 282");
-		        se = st.getEndingState("locked", "enabled", "null",  "providingservice", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 284");
+                se = st.getEndingState("locked", "enabled", "null", "providingservice", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 283");
-		        se = st.getEndingState("locked", "enabled", "null",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 285");
+                se = st.getEndingState("locked", "enabled", "null", "providingservice", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 284");
-		        se = st.getEndingState("locked", "enabled", "null",  "providingservice", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 286");
+                se = st.getEndingState("locked", "enabled", "null", "providingservice", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 285");
-		        se = st.getEndingState("locked", "enabled", "null",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 287");
+                se = st.getEndingState("locked", "enabled", "null", "providingservice", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStateException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 286");
-		        se = st.getEndingState("locked", "enabled", "null",  "providingservice", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 288");
+                se = st.getEndingState("locked", "enabled", "null", "providingservice", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 287");
-		        se = st.getEndingState("locked", "enabled", "null",  "providingservice", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStateException", makeString(se));
+                logger.info("??? StateTransition testcase 289");
+                se = st.getEndingState("locked", "enabled", "failed", "null", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 288");
-		        se = st.getEndingState("locked", "enabled", "null",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 290");
+                se = st.getEndingState("locked", "enabled", "failed", "null", "unlock");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 289");
-		        se = st.getEndingState("locked", "enabled", "failed",  "null", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 291");
+                se = st.getEndingState("locked", "enabled", "failed", "null", "disableFailed");
+                assertEquals("null,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 290");
-		        se = st.getEndingState("locked", "enabled", "failed",  "null", "unlock");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 292");
+                se = st.getEndingState("locked", "enabled", "failed", "null", "enableNotFailed");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 291");
-		        se = st.getEndingState("locked", "enabled", "failed",  "null", "disableFailed");
-				assertEquals("null,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 293");
+                se = st.getEndingState("locked", "enabled", "failed", "null", "disableDependency");
+                assertEquals("null,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 292");
-		        se = st.getEndingState("locked", "enabled", "failed",  "null", "enableNotFailed");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 294");
+                se = st.getEndingState("locked", "enabled", "failed", "null", "enableNoDependency");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 293");
-		        se = st.getEndingState("locked", "enabled", "failed",  "null", "disableDependency");
-				assertEquals("null,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 295");
+                se = st.getEndingState("locked", "enabled", "failed", "null", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 294");
-		        se = st.getEndingState("locked", "enabled", "failed",  "null", "enableNoDependency");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 296");
+                se = st.getEndingState("locked", "enabled", "failed", "null", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 295");
-		        se = st.getEndingState("locked", "enabled", "failed",  "null", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 297");
+                se = st.getEndingState("locked", "enabled", "failed", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 296");
-		        se = st.getEndingState("locked", "enabled", "failed",  "null", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 298");
+                se = st.getEndingState("locked", "enabled", "failed", "coldstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 297");
-		        se = st.getEndingState("locked", "enabled", "failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 299");
+                se = st.getEndingState("locked", "enabled", "failed", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 298");
-		        se = st.getEndingState("locked", "enabled", "failed",  "coldstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 300");
+                se = st.getEndingState("locked", "enabled", "failed", "coldstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 299");
-		        se = st.getEndingState("locked", "enabled", "failed",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 301");
+                se = st.getEndingState("locked", "enabled", "failed", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 300");
-		        se = st.getEndingState("locked", "enabled", "failed",  "coldstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 302");
+                se = st.getEndingState("locked", "enabled", "failed", "coldstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 301");
-		        se = st.getEndingState("locked", "enabled", "failed",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 303");
+                se = st.getEndingState("locked", "enabled", "failed", "coldstandby", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 302");
-		        se = st.getEndingState("locked", "enabled", "failed",  "coldstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 304");
+                se = st.getEndingState("locked", "enabled", "failed", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 303");
-		        se = st.getEndingState("locked", "enabled", "failed",  "coldstandby", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 305");
+                se = st.getEndingState("locked", "enabled", "failed", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 304");
-		        se = st.getEndingState("locked", "enabled", "failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 306");
+                se = st.getEndingState("locked", "enabled", "failed", "hotstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 305");
-		        se = st.getEndingState("locked", "enabled", "failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 307");
+                se = st.getEndingState("locked", "enabled", "failed", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 306");
-		        se = st.getEndingState("locked", "enabled", "failed",  "hotstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 308");
+                se = st.getEndingState("locked", "enabled", "failed", "hotstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 307");
-		        se = st.getEndingState("locked", "enabled", "failed",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 309");
+                se = st.getEndingState("locked", "enabled", "failed", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 308");
-		        se = st.getEndingState("locked", "enabled", "failed",  "hotstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 310");
+                se = st.getEndingState("locked", "enabled", "failed", "hotstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 309");
-		        se = st.getEndingState("locked", "enabled", "failed",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 311");
+                se = st.getEndingState("locked", "enabled", "failed", "hotstandby", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 310");
-		        se = st.getEndingState("locked", "enabled", "failed",  "hotstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 312");
+                se = st.getEndingState("locked", "enabled", "failed", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 311");
-		        se = st.getEndingState("locked", "enabled", "failed",  "hotstandby", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 313");
+                se = st.getEndingState("locked", "enabled", "failed", "providingservice", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 312");
-		        se = st.getEndingState("locked", "enabled", "failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 314");
+                se = st.getEndingState("locked", "enabled", "failed", "providingservice", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 313");
-		        se = st.getEndingState("locked", "enabled", "failed",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 315");
+                se = st.getEndingState("locked", "enabled", "failed", "providingservice", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 314");
-		        se = st.getEndingState("locked", "enabled", "failed",  "providingservice", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 316");
+                se = st.getEndingState("locked", "enabled", "failed", "providingservice", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 315");
-		        se = st.getEndingState("locked", "enabled", "failed",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 317");
+                se = st.getEndingState("locked", "enabled", "failed", "providingservice", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 316");
-		        se = st.getEndingState("locked", "enabled", "failed",  "providingservice", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 318");
+                se = st.getEndingState("locked", "enabled", "failed", "providingservice", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 317");
-		        se = st.getEndingState("locked", "enabled", "failed",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 319");
+                se = st.getEndingState("locked", "enabled", "failed", "providingservice", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 318");
-		        se = st.getEndingState("locked", "enabled", "failed",  "providingservice", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 320");
+                se = st.getEndingState("locked", "enabled", "failed", "providingservice", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 319");
-		        se = st.getEndingState("locked", "enabled", "failed",  "providingservice", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 321");
+                se = st.getEndingState("locked", "enabled", "dependency", "null", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 320");
-		        se = st.getEndingState("locked", "enabled", "failed",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 322");
+                se = st.getEndingState("locked", "enabled", "dependency", "null", "unlock");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 321");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "null", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 323");
+                se = st.getEndingState("locked", "enabled", "dependency", "null", "disableFailed");
+                assertEquals("null,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 322");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "null", "unlock");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 324");
+                se = st.getEndingState("locked", "enabled", "dependency", "null", "enableNotFailed");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 323");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "null", "disableFailed");
-				assertEquals("null,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 325");
+                se = st.getEndingState("locked", "enabled", "dependency", "null", "disableDependency");
+                assertEquals("null,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 324");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "null", "enableNotFailed");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 326");
+                se = st.getEndingState("locked", "enabled", "dependency", "null", "enableNoDependency");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 325");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "null", "disableDependency");
-				assertEquals("null,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 327");
+                se = st.getEndingState("locked", "enabled", "dependency", "null", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 326");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "null", "enableNoDependency");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 328");
+                se = st.getEndingState("locked", "enabled", "dependency", "null", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 327");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "null", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 329");
+                se = st.getEndingState("locked", "enabled", "dependency", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 328");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "null", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 330");
+                se = st.getEndingState("locked", "enabled", "dependency", "coldstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 329");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 331");
+                se = st.getEndingState("locked", "enabled", "dependency", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 330");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "coldstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 332");
+                se = st.getEndingState("locked", "enabled", "dependency", "coldstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 331");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 333");
+                se = st.getEndingState("locked", "enabled", "dependency", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 332");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "coldstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 334");
+                se = st.getEndingState("locked", "enabled", "dependency", "coldstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 333");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 335");
+                se = st.getEndingState("locked", "enabled", "dependency", "coldstandby", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 334");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "coldstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 336");
+                se = st.getEndingState("locked", "enabled", "dependency", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 335");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "coldstandby", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 337");
+                se = st.getEndingState("locked", "enabled", "dependency", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 336");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 338");
+                se = st.getEndingState("locked", "enabled", "dependency", "hotstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 337");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 339");
+                se = st.getEndingState("locked", "enabled", "dependency", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 338");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "hotstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 340");
+                se = st.getEndingState("locked", "enabled", "dependency", "hotstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 339");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 341");
+                se = st.getEndingState("locked", "enabled", "dependency", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 340");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "hotstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 342");
+                se = st.getEndingState("locked", "enabled", "dependency", "hotstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 341");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 343");
+                se = st.getEndingState("locked", "enabled", "dependency", "hotstandby", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 342");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "hotstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 344");
+                se = st.getEndingState("locked", "enabled", "dependency", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 343");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "hotstandby", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 345");
+                se = st.getEndingState("locked", "enabled", "dependency", "providingservice", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 344");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 346");
+                se = st.getEndingState("locked", "enabled", "dependency", "providingservice", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 345");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 347");
+                se = st.getEndingState("locked", "enabled", "dependency", "providingservice", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 346");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "providingservice", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 348");
+                se = st.getEndingState("locked", "enabled", "dependency", "providingservice", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 347");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 349");
+                se = st.getEndingState("locked", "enabled", "dependency", "providingservice", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 348");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "providingservice", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 350");
+                se = st.getEndingState("locked", "enabled", "dependency", "providingservice", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 349");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 351");
+                se = st.getEndingState("locked", "enabled", "dependency", "providingservice", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 350");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "providingservice", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 352");
+                se = st.getEndingState("locked", "enabled", "dependency", "providingservice", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 351");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "providingservice", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 353");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "null", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 352");
-		        se = st.getEndingState("locked", "enabled", "dependency",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 354");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "null", "unlock");
+                assertEquals("null,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 353");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "null", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 355");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "null", "disableFailed");
+                assertEquals("null,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 354");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "null", "unlock");
-				assertEquals("null,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 356");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "null", "enableNotFailed");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 355");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "null", "disableFailed");
-				assertEquals("null,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 357");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "null", "disableDependency");
+                assertEquals("null,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 356");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "null", "enableNotFailed");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 358");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "null", "enableNoDependency");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 357");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "null", "disableDependency");
-				assertEquals("null,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 359");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "null", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 358");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "null", "enableNoDependency");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 360");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "null", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 359");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "null", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 361");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 360");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "null", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 362");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "coldstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 361");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 363");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 362");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "coldstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 364");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "coldstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 363");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 365");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 364");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "coldstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 366");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "coldstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 365");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 367");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "coldstandby", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 366");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "coldstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 368");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 367");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "coldstandby", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 369");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 368");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 370");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "hotstandby", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 369");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 371");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 370");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "hotstandby", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 372");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "hotstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 371");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 373");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 372");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "hotstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 374");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "hotstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 373");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 375");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "hotstandby", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 374");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "hotstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 376");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 375");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "hotstandby", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 377");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "providingservice", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 376");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 378");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "providingservice", "unlock");
+                assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 377");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 379");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "providingservice", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 378");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "providingservice", "unlock");
-				assertEquals("hotstandby,unlocked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 380");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "providingservice", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 379");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 381");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "providingservice",
+                        "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+
+                logger.info("??? StateTransition testcase 382");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "providingservice",
+                        "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 380");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "providingservice", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 383");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "providingservice", "promote");
+                assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 381");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 384");
+                se = st.getEndingState("locked", "enabled", "dependency,failed", "providingservice", "demote");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 382");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "providingservice", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 385");
+                se = st.getEndingState("locked", "disabled", "null", "null", "demote");
+                assertEquals("coldstandby,locked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 383");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "providingservice", "promote");
-				assertEquals("coldstandby,locked,enabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 386");
+                se = st.getEndingState("locked", "disabled", "null", "null", "unlock");
+                assertEquals("null,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 384");
-		        se = st.getEndingState("locked", "enabled", "dependency,failed",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 387");
+                se = st.getEndingState("locked", "disabled", "null", "null", "disableFailed");
+                assertEquals("null,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 385");
-		        se = st.getEndingState("locked", "disabled", "null",  "null", "demote");
-				assertEquals("coldstandby,locked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 388");
+                se = st.getEndingState("locked", "disabled", "null", "null", "enableNotFailed");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 386");
-		        se = st.getEndingState("locked", "disabled", "null",  "null", "unlock");
-				assertEquals("null,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 389");
+                se = st.getEndingState("locked", "disabled", "null", "null", "disableDependency");
+                assertEquals("null,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 387");
-		        se = st.getEndingState("locked", "disabled", "null",  "null", "disableFailed");
-				assertEquals("null,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 390");
+                se = st.getEndingState("locked", "disabled", "null", "null", "enableNoDependency");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 388");
-		        se = st.getEndingState("locked", "disabled", "null",  "null", "enableNotFailed");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 391");
+                se = st.getEndingState("locked", "disabled", "null", "null", "promote");
+                assertEquals("coldstandby,locked,disabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 389");
-		        se = st.getEndingState("locked", "disabled", "null",  "null", "disableDependency");
-				assertEquals("null,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 392");
+                se = st.getEndingState("locked", "disabled", "null", "null", "demote");
+                assertEquals("coldstandby,locked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 390");
-		        se = st.getEndingState("locked", "disabled", "null",  "null", "enableNoDependency");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 393");
+                se = st.getEndingState("locked", "disabled", "null", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 391");
-		        se = st.getEndingState("locked", "disabled", "null",  "null", "promote");
-				assertEquals("coldstandby,locked,disabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 394");
+                se = st.getEndingState("locked", "disabled", "null", "coldstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 392");
-		        se = st.getEndingState("locked", "disabled", "null",  "null", "demote");
-				assertEquals("coldstandby,locked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 395");
+                se = st.getEndingState("locked", "disabled", "null", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 393");
-		        se = st.getEndingState("locked", "disabled", "null",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 396");
+                se = st.getEndingState("locked", "disabled", "null", "coldstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 394");
-		        se = st.getEndingState("locked", "disabled", "null",  "coldstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 397");
+                se = st.getEndingState("locked", "disabled", "null", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 395");
-		        se = st.getEndingState("locked", "disabled", "null",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 398");
+                se = st.getEndingState("locked", "disabled", "null", "coldstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 396");
-		        se = st.getEndingState("locked", "disabled", "null",  "coldstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 399");
+                se = st.getEndingState("locked", "disabled", "null", "coldstandby", "promote");
+                assertEquals("coldstandby,locked,disabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 397");
-		        se = st.getEndingState("locked", "disabled", "null",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 400");
+                se = st.getEndingState("locked", "disabled", "null", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 398");
-		        se = st.getEndingState("locked", "disabled", "null",  "coldstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 401");
+                se = st.getEndingState("locked", "disabled", "null", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 399");
-		        se = st.getEndingState("locked", "disabled", "null",  "coldstandby", "promote");
-				assertEquals("coldstandby,locked,disabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 402");
+                se = st.getEndingState("locked", "disabled", "null", "hotstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 400");
-		        se = st.getEndingState("locked", "disabled", "null",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 403");
+                se = st.getEndingState("locked", "disabled", "null", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 401");
-		        se = st.getEndingState("locked", "disabled", "null",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 404");
+                se = st.getEndingState("locked", "disabled", "null", "hotstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 402");
-		        se = st.getEndingState("locked", "disabled", "null",  "hotstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 405");
+                se = st.getEndingState("locked", "disabled", "null", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 403");
-		        se = st.getEndingState("locked", "disabled", "null",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 406");
+                se = st.getEndingState("locked", "disabled", "null", "hotstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 404");
-		        se = st.getEndingState("locked", "disabled", "null",  "hotstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 407");
+                se = st.getEndingState("locked", "disabled", "null", "hotstandby", "promote");
+                assertEquals("coldstandby,locked,disabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 405");
-		        se = st.getEndingState("locked", "disabled", "null",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 408");
+                se = st.getEndingState("locked", "disabled", "null", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 406");
-		        se = st.getEndingState("locked", "disabled", "null",  "hotstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 409");
+                se = st.getEndingState("locked", "disabled", "null", "providingservice", "demote");
+                assertEquals("coldstandby,locked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 407");
-		        se = st.getEndingState("locked", "disabled", "null",  "hotstandby", "promote");
-				assertEquals("coldstandby,locked,disabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 410");
+                se = st.getEndingState("locked", "disabled", "null", "providingservice", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 408");
-		        se = st.getEndingState("locked", "disabled", "null",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 411");
+                se = st.getEndingState("locked", "disabled", "null", "providingservice", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 409");
-		        se = st.getEndingState("locked", "disabled", "null",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 412");
+                se = st.getEndingState("locked", "disabled", "null", "providingservice", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 410");
-		        se = st.getEndingState("locked", "disabled", "null",  "providingservice", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 413");
+                se = st.getEndingState("locked", "disabled", "null", "providingservice", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 411");
-		        se = st.getEndingState("locked", "disabled", "null",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 414");
+                se = st.getEndingState("locked", "disabled", "null", "providingservice", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 412");
-		        se = st.getEndingState("locked", "disabled", "null",  "providingservice", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 415");
+                se = st.getEndingState("locked", "disabled", "null", "providingservice", "promote");
+                assertEquals("coldstandby,locked,disabled,null,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 413");
-		        se = st.getEndingState("locked", "disabled", "null",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 416");
+                se = st.getEndingState("locked", "disabled", "null", "providingservice", "demote");
+                assertEquals("coldstandby,locked,disabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 414");
-		        se = st.getEndingState("locked", "disabled", "null",  "providingservice", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 417");
+                se = st.getEndingState("locked", "disabled", "failed", "null", "demote");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 415");
-		        se = st.getEndingState("locked", "disabled", "null",  "providingservice", "promote");
-				assertEquals("coldstandby,locked,disabled,null,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 418");
+                se = st.getEndingState("locked", "disabled", "failed", "null", "unlock");
+                assertEquals("null,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 416");
-		        se = st.getEndingState("locked", "disabled", "null",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,disabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 419");
+                se = st.getEndingState("locked", "disabled", "failed", "null", "disableFailed");
+                assertEquals("null,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 417");
-		        se = st.getEndingState("locked", "disabled", "failed",  "null", "demote");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 420");
+                se = st.getEndingState("locked", "disabled", "failed", "null", "enableNotFailed");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 418");
-		        se = st.getEndingState("locked", "disabled", "failed",  "null", "unlock");
-				assertEquals("null,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 421");
+                se = st.getEndingState("locked", "disabled", "failed", "null", "disableDependency");
+                assertEquals("null,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 419");
-		        se = st.getEndingState("locked", "disabled", "failed",  "null", "disableFailed");
-				assertEquals("null,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 422");
+                se = st.getEndingState("locked", "disabled", "failed", "null", "enableNoDependency");
+                assertEquals("null,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 420");
-		        se = st.getEndingState("locked", "disabled", "failed",  "null", "enableNotFailed");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 423");
+                se = st.getEndingState("locked", "disabled", "failed", "null", "promote");
+                assertEquals("coldstandby,locked,disabled,failed,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 421");
-		        se = st.getEndingState("locked", "disabled", "failed",  "null", "disableDependency");
-				assertEquals("null,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 424");
+                se = st.getEndingState("locked", "disabled", "failed", "null", "demote");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 422");
-		        se = st.getEndingState("locked", "disabled", "failed",  "null", "enableNoDependency");
-				assertEquals("null,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 425");
+                se = st.getEndingState("locked", "disabled", "failed", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 423");
-		        se = st.getEndingState("locked", "disabled", "failed",  "null", "promote");
-				assertEquals("coldstandby,locked,disabled,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 426");
+                se = st.getEndingState("locked", "disabled", "failed", "coldstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 424");
-		        se = st.getEndingState("locked", "disabled", "failed",  "null", "demote");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 427");
+                se = st.getEndingState("locked", "disabled", "failed", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 425");
-		        se = st.getEndingState("locked", "disabled", "failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 428");
+                se = st.getEndingState("locked", "disabled", "failed", "coldstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 426");
-		        se = st.getEndingState("locked", "disabled", "failed",  "coldstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 429");
+                se = st.getEndingState("locked", "disabled", "failed", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 427");
-		        se = st.getEndingState("locked", "disabled", "failed",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 430");
+                se = st.getEndingState("locked", "disabled", "failed", "coldstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 428");
-		        se = st.getEndingState("locked", "disabled", "failed",  "coldstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 431");
+                se = st.getEndingState("locked", "disabled", "failed", "coldstandby", "promote");
+                assertEquals("coldstandby,locked,disabled,failed,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 429");
-		        se = st.getEndingState("locked", "disabled", "failed",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 432");
+                se = st.getEndingState("locked", "disabled", "failed", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 430");
-		        se = st.getEndingState("locked", "disabled", "failed",  "coldstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 433");
+                se = st.getEndingState("locked", "disabled", "failed", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 431");
-		        se = st.getEndingState("locked", "disabled", "failed",  "coldstandby", "promote");
-				assertEquals("coldstandby,locked,disabled,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 434");
+                se = st.getEndingState("locked", "disabled", "failed", "hotstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 432");
-		        se = st.getEndingState("locked", "disabled", "failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 435");
+                se = st.getEndingState("locked", "disabled", "failed", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 433");
-		        se = st.getEndingState("locked", "disabled", "failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 436");
+                se = st.getEndingState("locked", "disabled", "failed", "hotstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 434");
-		        se = st.getEndingState("locked", "disabled", "failed",  "hotstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 437");
+                se = st.getEndingState("locked", "disabled", "failed", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 435");
-		        se = st.getEndingState("locked", "disabled", "failed",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 438");
+                se = st.getEndingState("locked", "disabled", "failed", "hotstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 436");
-		        se = st.getEndingState("locked", "disabled", "failed",  "hotstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 439");
+                se = st.getEndingState("locked", "disabled", "failed", "hotstandby", "promote");
+                assertEquals("coldstandby,locked,disabled,failed,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 437");
-		        se = st.getEndingState("locked", "disabled", "failed",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 440");
+                se = st.getEndingState("locked", "disabled", "failed", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 438");
-		        se = st.getEndingState("locked", "disabled", "failed",  "hotstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 441");
+                se = st.getEndingState("locked", "disabled", "failed", "providingservice", "demote");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 439");
-		        se = st.getEndingState("locked", "disabled", "failed",  "hotstandby", "promote");
-				assertEquals("coldstandby,locked,disabled,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 442");
+                se = st.getEndingState("locked", "disabled", "failed", "providingservice", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 440");
-		        se = st.getEndingState("locked", "disabled", "failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 443");
+                se = st.getEndingState("locked", "disabled", "failed", "providingservice", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 441");
-		        se = st.getEndingState("locked", "disabled", "failed",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 444");
+                se = st.getEndingState("locked", "disabled", "failed", "providingservice", "enableNotFailed");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 442");
-		        se = st.getEndingState("locked", "disabled", "failed",  "providingservice", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 445");
+                se = st.getEndingState("locked", "disabled", "failed", "providingservice", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 443");
-		        se = st.getEndingState("locked", "disabled", "failed",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 446");
+                se = st.getEndingState("locked", "disabled", "failed", "providingservice", "enableNoDependency");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 444");
-		        se = st.getEndingState("locked", "disabled", "failed",  "providingservice", "enableNotFailed");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 447");
+                se = st.getEndingState("locked", "disabled", "failed", "providingservice", "promote");
+                assertEquals("coldstandby,locked,disabled,failed,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 445");
-		        se = st.getEndingState("locked", "disabled", "failed",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 448");
+                se = st.getEndingState("locked", "disabled", "failed", "providingservice", "demote");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 446");
-		        se = st.getEndingState("locked", "disabled", "failed",  "providingservice", "enableNoDependency");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 449");
+                se = st.getEndingState("locked", "disabled", "dependency", "null", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 447");
-		        se = st.getEndingState("locked", "disabled", "failed",  "providingservice", "promote");
-				assertEquals("coldstandby,locked,disabled,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 450");
+                se = st.getEndingState("locked", "disabled", "dependency", "null", "unlock");
+                assertEquals("null,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 448");
-		        se = st.getEndingState("locked", "disabled", "failed",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 451");
+                se = st.getEndingState("locked", "disabled", "dependency", "null", "disableFailed");
+                assertEquals("null,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 449");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "null", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 452");
+                se = st.getEndingState("locked", "disabled", "dependency", "null", "enableNotFailed");
+                assertEquals("null,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 450");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "null", "unlock");
-				assertEquals("null,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 453");
+                se = st.getEndingState("locked", "disabled", "dependency", "null", "disableDependency");
+                assertEquals("null,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 451");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "null", "disableFailed");
-				assertEquals("null,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 454");
+                se = st.getEndingState("locked", "disabled", "dependency", "null", "enableNoDependency");
+                assertEquals("null,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 452");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "null", "enableNotFailed");
-				assertEquals("null,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 455");
+                se = st.getEndingState("locked", "disabled", "dependency", "null", "promote");
+                assertEquals("coldstandby,locked,disabled,dependency,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 453");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "null", "disableDependency");
-				assertEquals("null,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 456");
+                se = st.getEndingState("locked", "disabled", "dependency", "null", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 454");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "null", "enableNoDependency");
-				assertEquals("null,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 457");
+                se = st.getEndingState("locked", "disabled", "dependency", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 455");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "null", "promote");
-				assertEquals("coldstandby,locked,disabled,dependency,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 458");
+                se = st.getEndingState("locked", "disabled", "dependency", "coldstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 456");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "null", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 459");
+                se = st.getEndingState("locked", "disabled", "dependency", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 457");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 460");
+                se = st.getEndingState("locked", "disabled", "dependency", "coldstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 458");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "coldstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 461");
+                se = st.getEndingState("locked", "disabled", "dependency", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 459");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 462");
+                se = st.getEndingState("locked", "disabled", "dependency", "coldstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 460");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "coldstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 463");
+                se = st.getEndingState("locked", "disabled", "dependency", "coldstandby", "promote");
+                assertEquals("coldstandby,locked,disabled,dependency,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 461");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 464");
+                se = st.getEndingState("locked", "disabled", "dependency", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 462");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "coldstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 465");
+                se = st.getEndingState("locked", "disabled", "dependency", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 463");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "coldstandby", "promote");
-				assertEquals("coldstandby,locked,disabled,dependency,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 466");
+                se = st.getEndingState("locked", "disabled", "dependency", "hotstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 464");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 467");
+                se = st.getEndingState("locked", "disabled", "dependency", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 465");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 468");
+                se = st.getEndingState("locked", "disabled", "dependency", "hotstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 466");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "hotstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 469");
+                se = st.getEndingState("locked", "disabled", "dependency", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 467");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 470");
+                se = st.getEndingState("locked", "disabled", "dependency", "hotstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 468");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "hotstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 471");
+                se = st.getEndingState("locked", "disabled", "dependency", "hotstandby", "promote");
+                assertEquals("coldstandby,locked,disabled,dependency,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 469");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 472");
+                se = st.getEndingState("locked", "disabled", "dependency", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 470");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "hotstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 473");
+                se = st.getEndingState("locked", "disabled", "dependency", "providingservice", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 471");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "hotstandby", "promote");
-				assertEquals("coldstandby,locked,disabled,dependency,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 474");
+                se = st.getEndingState("locked", "disabled", "dependency", "providingservice", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 472");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 475");
+                se = st.getEndingState("locked", "disabled", "dependency", "providingservice", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 473");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 476");
+                se = st.getEndingState("locked", "disabled", "dependency", "providingservice", "enableNotFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 474");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "providingservice", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 477");
+                se = st.getEndingState("locked", "disabled", "dependency", "providingservice", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 475");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 478");
+                se = st.getEndingState("locked", "disabled", "dependency", "providingservice", "enableNoDependency");
+                assertEquals("coldstandby,locked,enabled,null,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 476");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "providingservice", "enableNotFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 479");
+                se = st.getEndingState("locked", "disabled", "dependency", "providingservice", "promote");
+                assertEquals("coldstandby,locked,disabled,dependency,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 477");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 480");
+                se = st.getEndingState("locked", "disabled", "dependency", "providingservice", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 478");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "providingservice", "enableNoDependency");
-				assertEquals("coldstandby,locked,enabled,null,", makeString(se));
+                logger.info("??? StateTransition testcase 481");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "null", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 479");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "providingservice", "promote");
-				assertEquals("coldstandby,locked,disabled,dependency,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 482");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "null", "unlock");
+                assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 480");
-		        se = st.getEndingState("locked", "disabled", "dependency",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 483");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "null", "disableFailed");
+                assertEquals("null,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 481");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "null", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 484");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "null", "enableNotFailed");
+                assertEquals("null,locked,disabled,dependency,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 482");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "null", "unlock");
-				assertEquals("null,unlocked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 485");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "null", "disableDependency");
+                assertEquals("null,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 483");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "null", "disableFailed");
-				assertEquals("null,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 486");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "null", "enableNoDependency");
+                assertEquals("null,locked,disabled,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 484");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "null", "enableNotFailed");
-				assertEquals("null,locked,disabled,dependency,", makeString(se));
+                logger.info("??? StateTransition testcase 487");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "null", "promote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,StandbyStatusException", makeString(se));
 
-		        logger.info("??? StateTransition testcase 485");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "null", "disableDependency");
-				assertEquals("null,locked,disabled,dependency,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 488");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "null", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 486");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "null", "enableNoDependency");
-				assertEquals("null,locked,disabled,failed,", makeString(se));
+                logger.info("??? StateTransition testcase 489");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 487");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "null", "promote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+                logger.info("??? StateTransition testcase 490");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "coldstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 491");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "coldstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
 
-		        logger.info("??? StateTransition testcase 488");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "null", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 489");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 490");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "coldstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 491");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "coldstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 492");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "coldstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 493");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "coldstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 494");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "coldstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 495");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "coldstandby", "promote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,StandbyStatusException", makeString(se));
-
-		        logger.info("??? StateTransition testcase 496");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "coldstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 497");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 498");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "hotstandby", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 499");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "hotstandby", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 500");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "hotstandby", "enableNotFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 501");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "hotstandby", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 502");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "hotstandby", "enableNoDependency");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 503");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "hotstandby", "promote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,StandbyStatusException", makeString(se));
-
-		        logger.info("??? StateTransition testcase 504");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "hotstandby", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 505");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 506");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "providingservice", "unlock");
-				assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 507");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "providingservice", "disableFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 508");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "providingservice", "enableNotFailed");
-				assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 509");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "providingservice", "disableDependency");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 510");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "providingservice", "enableNoDependency");
-				assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
-
-		        logger.info("??? StateTransition testcase 511");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "providingservice", "promote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,StandbyStatusException", makeString(se));
-
-		        logger.info("??? StateTransition testcase 512");
-		        se = st.getEndingState("locked", "disabled", "dependency,failed",  "providingservice", "demote");
-				assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
-		        
-		    } catch (Exception ex) {
-		    	logger.error("EndingState NOT found");
-		    	throw new Exception("EndingState NOT found. " + ex);
-		    }
-		    
-		} catch(Exception ex) {
-			logger.error("Exception: {}" + ex.toString());
-			throw new Exception("Failure getting ending state. " + ex );
-		}
-
-	    logger.info("\n\nStateTransitionTest: Exit\n\n");
-	}
-
-	/**
-	 * Converts a state element to a comma-separated string.
-	 * @param se	element to be converted
-	 * @return a string representing the element
-	 */
-	private String makeString(StateElement se)
-	{
-		if(se == null) {
-			return null;
-		}
-		
-		StringBuilder b = new StringBuilder();
-		
-		String endingStandbyStatus = se.getEndingStandbyStatus();
-		if (endingStandbyStatus != null) {
-			b.append(endingStandbyStatus.replace(".",  ","));
-			b.append(',');
-		}
-		
-		b.append(se.getEndingAdminState());
-		b.append(',');
-		b.append(se.getEndingOpState());
-		b.append(',');
-		b.append(se.getEndingAvailStatus());
-		b.append(',');
-		b.append(se.getException());
-	   	
-	   	return b.toString();
-	}
+                logger.info("??? StateTransition testcase 492");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "coldstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+
+                logger.info("??? StateTransition testcase 493");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "coldstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 494");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "coldstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 495");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "coldstandby", "promote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+
+                logger.info("??? StateTransition testcase 496");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "coldstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 497");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 498");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "hotstandby", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 499");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "hotstandby", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 500");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "hotstandby", "enableNotFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+
+                logger.info("??? StateTransition testcase 501");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "hotstandby", "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 502");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "hotstandby", "enableNoDependency");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 503");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "hotstandby", "promote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+
+                logger.info("??? StateTransition testcase 504");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "hotstandby", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 505");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "providingservice", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 506");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "providingservice", "unlock");
+                assertEquals("coldstandby,unlocked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 507");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "providingservice", "disableFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 508");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "providingservice",
+                        "enableNotFailed");
+                assertEquals("coldstandby,locked,disabled,dependency,", makeString(se));
+
+                logger.info("??? StateTransition testcase 509");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "providingservice",
+                        "disableDependency");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 510");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "providingservice",
+                        "enableNoDependency");
+                assertEquals("coldstandby,locked,disabled,failed,", makeString(se));
+
+                logger.info("??? StateTransition testcase 511");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "providingservice", "promote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,StandbyStatusException", makeString(se));
+
+                logger.info("??? StateTransition testcase 512");
+                se = st.getEndingState("locked", "disabled", "dependency,failed", "providingservice", "demote");
+                assertEquals("coldstandby,locked,disabled,dependency,failed,", makeString(se));
+
+            } catch (Exception ex) {
+                logger.error("EndingState NOT found");
+                throw new Exception("EndingState NOT found. " + ex);
+            }
+
+        } catch (Exception ex) {
+            logger.error("Exception: {}" + ex.toString());
+            throw new Exception("Failure getting ending state. " + ex);
+        }
+
+        logger.info("\n\nStateTransitionTest: Exit\n\n");
+    }
+
+    /**
+     * Converts a state element to a comma-separated string.
+     * 
+     * @param se element to be converted
+     * @return a string representing the element
+     */
+    private String makeString(StateElement se) {
+        if (se == null) {
+            return null;
+        }
+
+        StringBuilder stringBuilder = new StringBuilder();
+
+        String endingStandbyStatus = se.getEndingStandbyStatus();
+        if (endingStandbyStatus != null) {
+            stringBuilder.append(endingStandbyStatus.replace(".", ","));
+            stringBuilder.append(',');
+        }
+
+        stringBuilder.append(se.getEndingAdminState());
+        stringBuilder.append(',');
+        stringBuilder.append(se.getEndingOpState());
+        stringBuilder.append(',');
+        stringBuilder.append(se.getEndingAvailStatus());
+        stringBuilder.append(',');
+        stringBuilder.append(se.getException());
+
+        return stringBuilder.toString();
+    }
 }
diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/exceptions/EntityRetrievalExceptionTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/exceptions/EntityRetrievalExceptionTest.java
index 8d948241..48ec3b86 100644
--- a/integrity-monitor/src/test/java/org/onap/policy/common/im/exceptions/EntityRetrievalExceptionTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/exceptions/EntityRetrievalExceptionTest.java
@@ -21,6 +21,7 @@
 package org.onap.policy.common.im.exceptions;
 
 import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 import org.onap.policy.common.utils.test.ExceptionsTester;