Conditional test cases

Additional coverage for other tests.
Remove unused Benchmark api

Change-Id: Ib091f1827a226a4a50e3427b20af4c8b12c363c3
Issue-ID: MUSIC-341
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>

7 files changed, 724 insertions, 721 deletions

diff --git a/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.java b/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.java
index 2a267387..c523d5f4 100644
--- a/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.java
+++ b/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.java
@@ -82,8 +82,8 @@ public class RestMusicConditionalAPI {
             @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
             @ApiParam(value = "Application namespace", required = true) @HeaderParam(NS) String ns,
             @ApiParam(value = "Authorization", required = true) @HeaderParam("Authorization") String authorization,
-            @ApiParam(value = "Major Version", required = true) @PathParam("keyspace") String keyspace,
-            @ApiParam(value = "Major Version", required = true) @PathParam("tablename") String tablename,
+            @ApiParam(value = "Keyspace Name", required = true) @PathParam("keyspace") String keyspace,
+            @ApiParam(value = "Table Name", required = true) @PathParam("tablename") String tablename,
             JsonConditional jsonObj) throws Exception {
         ResponseBuilder response = MusicUtil.buildVersionResponse(VERSION, minorVersion, patchVersion);
         String primaryKey = jsonObj.getPrimaryKey();
diff --git a/src/main/java/org/onap/music/rest/RestMusicBmAPI.java b/src/main/java/org/onap/music/rest/RestMusicBmAPI.java
deleted file mode 100644
index f2946c14..00000000
--- a/src/main/java/org/onap/music/rest/RestMusicBmAPI.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property
- * ===================================================================
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * 
- * ============LICENSE_END=============================================
- * ====================================================================
- */
-
-package org.onap.music.rest;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-import org.onap.music.datastore.jsonobjects.JsonInsert;
-import org.onap.music.eelf.logging.EELFLoggerDelegate;
-import org.onap.music.main.MusicCore;
-import org.onap.music.main.MusicUtil;
-import org.onap.music.main.ResultType;
-import org.onap.music.main.ReturnType;
-import org.onap.music.service.impl.MusicZKCore;
-import org.onap.music.datastore.MusicDataStoreHandle;
-import org.onap.music.datastore.PreparedQueryObject;
-import com.datastax.driver.core.DataType;
-import com.datastax.driver.core.TableMetadata;
-import io.swagger.annotations.Api;
-
-/*
- * These are functions created purely for benchmarking purposes. Commented out Swagger - This should
- * be undocumented API
- * 
- */
-@Path("/v{version: [0-9]+}/benchmarks/")
-@Api(value = "Benchmark API", hidden = true)
-public class RestMusicBmAPI {
-
-    private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RestMusicBmAPI.class);
-    public static final String UPDATE_CONST=" update-";
-    // pure zk calls...
-
-    /**
-     * 
-     * @param nodeName
-     * @throws Exception
-     */
-    @POST
-    @Path("/purezk/{name}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    public void pureZkCreate(@PathParam("name") String nodeName) throws Exception {
-        MusicZKCore.pureZkCreate("/" + nodeName);
-    }
-
-
-    /**
-     * 
-     * @param insObj
-     * @param nodeName
-     * @throws Exception
-     */
-    @PUT
-    @Path("/purezk/{name}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    public void pureZkUpdate(JsonInsert insObj, @PathParam("name") String nodeName)
-                    throws Exception {
-        logger.info(EELFLoggerDelegate.applicationLogger,"--------------Zk normal update-------------------------");
-        long start = System.currentTimeMillis();
-        MusicZKCore.pureZkWrite(nodeName, insObj.serialize());
-        long end = System.currentTimeMillis();
-        logger.info(EELFLoggerDelegate.applicationLogger,"Total time taken for Zk normal update:" + (end - start) + " ms");
-    }
-
-    /**
-     * 
-     * @param nodeName
-     * @return
-     * @throws Exception
-     */
-    @GET
-    @Path("/purezk/{name}")
-    @Consumes(MediaType.TEXT_PLAIN)
-    public byte[] pureZkGet(@PathParam("name") String nodeName) throws Exception {
-        return MusicZKCore.pureZkRead(nodeName);
-    }
-
-    /**
-     * 
-     * @param insObj
-     * @param lockName
-     * @param nodeName
-     * @throws Exception
-     */
-    @PUT
-    @Path("/purezk/atomic/{lockname}/{name}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    public void pureZkAtomicPut(JsonInsert updateObj, @PathParam("lockname") String lockname,
-                    @PathParam("name") String nodeName) throws Exception {
-        long startTime = System.currentTimeMillis();
-        String operationId = UUID.randomUUID().toString();// just for debugging purposes.
-        String consistency = updateObj.getConsistencyInfo().get("type");
-
-        logger.info(EELFLoggerDelegate.applicationLogger,"--------------Zookeeper " + consistency + UPDATE_CONST + operationId
-                        + "-------------------------");
-
-        byte[] data = updateObj.serialize();
-        long jsonParseCompletionTime = System.currentTimeMillis();
-
-        String lockId = MusicCore.createLockReference(lockname);
-
-        long lockCreationTime = System.currentTimeMillis();
-
-        long leasePeriod = MusicUtil.getDefaultLockLeasePeriod();
-        ReturnType lockAcqResult = MusicCore.acquireLockWithLease(lockname, lockId, leasePeriod);
-        long lockAcqTime = System.currentTimeMillis();
-        long zkPutTime = 0;
-        long lockReleaseTime = 0;
-
-        if (lockAcqResult.getResult().equals(ResultType.SUCCESS)) {
-            logger.info(EELFLoggerDelegate.applicationLogger,"acquired lock with id " + lockId);
-            MusicZKCore.pureZkWrite(lockname, data);
-            zkPutTime = System.currentTimeMillis();
-            boolean voluntaryRelease = true;
-/*<<<<<<< HEAD
-            if (("atomic").equals(consistency))
-                MusicCore.releaseLock(lockId, voluntaryRelease);
-            else if (("atomic_delete_lock").equals(consistency))
-                MusicCore.deleteLock(lockname);
-=======*/
-            if (consistency.equals("atomic"))
-                MusicCore.releaseLock(lockId, voluntaryRelease);
-            else if (consistency.equals("atomic_delete_lock"))
-                MusicCore.deleteLock(lockname);
-            lockReleaseTime = System.currentTimeMillis();
-        } else {
-            MusicCore.destroyLockRef(lockId);
-        }
-
-        long actualUpdateCompletionTime = System.currentTimeMillis();
-
-
-        long endTime = System.currentTimeMillis();
-
-        String lockingInfo = "|lock creation time:" + (lockCreationTime - jsonParseCompletionTime)
-                        + "|lock accquire time:" + (lockAcqTime - lockCreationTime)
-                        + "|zk put time:" + (zkPutTime - lockAcqTime);
-
-        if ("atomic".equals(consistency))
-            lockingInfo = lockingInfo + "|lock release time:" + (lockReleaseTime - zkPutTime) + "|";
-        else if ("atomic_delete_lock".equals(consistency))
-            lockingInfo = lockingInfo + "|lock delete time:" + (lockReleaseTime - zkPutTime) + "|";
-
-        String timingString = "Time taken in ms for Zookeeper " + consistency + UPDATE_CONST
-                        + operationId + ":" + "|total operation time:" + (endTime - startTime)
-                        + "|json parsing time:" + (jsonParseCompletionTime - startTime)
-                        + "|update time:" + (actualUpdateCompletionTime - jsonParseCompletionTime)
-                        + lockingInfo;
-
-        logger.info(EELFLoggerDelegate.applicationLogger,timingString);
-    }
-
-    /**
-     * 
-     * @param insObj
-     * @param lockName
-     * @param nodeName
-     * @throws Exception
-     */
-    @GET
-    @Path("/purezk/atomic/{lockname}/{name}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    public void pureZkAtomicGet(JsonInsert insObj, @PathParam("lockname") String lockName,
-                    @PathParam("name") String nodeName) throws Exception {
-        logger.info("--------------Zk atomic read-------------------------");
-        long start = System.currentTimeMillis();
-        String lockId = MusicCore.createLockReference(lockName);
-        long leasePeriod = MusicUtil.getDefaultLockLeasePeriod();
-        ReturnType lockAcqResult = MusicCore.acquireLockWithLease(lockName, lockId, leasePeriod);
-        if (lockAcqResult.getResult().equals(ResultType.SUCCESS)) {
-            logger.info("acquired lock with id " + lockId);
-            MusicZKCore.pureZkRead(nodeName);
-            boolean voluntaryRelease = true;
-            MusicCore.releaseLock(lockId, voluntaryRelease);
-        } else {
-            MusicCore.destroyLockRef(lockId);
-        }
-
-        long end = System.currentTimeMillis();
-        logger.info(EELFLoggerDelegate.applicationLogger,"Total time taken for Zk atomic read:" + (end - start) + " ms");
-    }
-
-    /**
-     *
-     * doing an update directly to cassa but through the rest api
-     * 
-     * @param insObj
-     * @param keyspace
-     * @param tablename
-     * @param info
-     * @return
-     * @throws Exception
-     */
-    @PUT
-    @Path("/cassa/keyspaces/{keyspace}/tables/{tablename}/rows")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public boolean updateTableCassa(JsonInsert insObj, @PathParam("keyspace") String keyspace,
-                    @PathParam("tablename") String tablename, @Context UriInfo info)
-                    throws Exception {
-        long startTime = System.currentTimeMillis();
-        String operationId = UUID.randomUUID().toString();// just for debugging purposes.
-        String consistency = insObj.getConsistencyInfo().get("type");
-        logger.info(EELFLoggerDelegate.applicationLogger,"--------------Cassandra " + consistency + UPDATE_CONST + operationId
-                        + "-------------------------");
-        PreparedQueryObject queryObject = new PreparedQueryObject();
-        Map<String, Object> valuesMap = insObj.getValues();
-        TableMetadata tableInfo = MusicDataStoreHandle.returnColumnMetadata(keyspace, tablename);
-        String vectorTs = "'" + Thread.currentThread().getId() + System.currentTimeMillis() + "'";
-        String fieldValueString = "vector_ts= ? ,";
-        queryObject.addValue(vectorTs);
-
-        int counter = 0;
-        for (Map.Entry<String, Object> entry : valuesMap.entrySet()) {
-            Object valueObj = entry.getValue();
-            DataType colType = tableInfo.getColumn(entry.getKey()).getType();
-            Object valueString = MusicUtil.convertToActualDataType(colType, valueObj);
-            fieldValueString = fieldValueString + entry.getKey() + "= ?";
-            queryObject.addValue(valueString);
-            if (counter != valuesMap.size() - 1)
-                fieldValueString = fieldValueString + ",";
-            counter = counter + 1;
-        }
-
-        // get the row specifier
-        String rowSpec = "";
-        counter = 0;
-        queryObject.appendQueryString("UPDATE " + keyspace + "." + tablename + " ");
-        MultivaluedMap<String, String> rowParams = info.getQueryParameters();
-        String primaryKey = "";
-        for (MultivaluedMap.Entry<String, List<String>> entry : rowParams.entrySet()) {
-            String keyName = entry.getKey();
-            List<String> valueList = entry.getValue();
-            String indValue = valueList.get(0);
-            DataType colType = tableInfo.getColumn(entry.getKey()).getType();
-            Object formattedValue = MusicUtil.convertToActualDataType(colType, indValue);
-            primaryKey = primaryKey + indValue;
-            rowSpec = rowSpec + keyName + "= ? ";
-            queryObject.addValue(formattedValue);
-            if (counter != rowParams.size() - 1)
-                rowSpec = rowSpec + " AND ";
-            counter = counter + 1;
-        }
-
-
-        String ttl = insObj.getTtl();
-        String timestamp = insObj.getTimestamp();
-
-        if ((ttl != null) && (timestamp != null)) {
-
-            logger.info(EELFLoggerDelegate.applicationLogger,"both there");
-            queryObject.appendQueryString(" USING TTL ? AND TIMESTAMP ?");
-            queryObject.addValue(Integer.parseInt(ttl));
-            queryObject.addValue(Long.parseLong(timestamp));
-        }
-
-        if ((ttl != null) && (timestamp == null)) {
-            logger.info(EELFLoggerDelegate.applicationLogger,"ONLY TTL there");
-            queryObject.appendQueryString(" USING TTL ?");
-            queryObject.addValue(Integer.parseInt(ttl));
-        }
-
-        if ((ttl == null) && (timestamp != null)) {
-            logger.info(EELFLoggerDelegate.applicationLogger,"ONLY timestamp there");
-            queryObject.appendQueryString(" USING TIMESTAMP ?");
-            queryObject.addValue(Long.parseLong(timestamp));
-        }
-        queryObject.appendQueryString(" SET " + fieldValueString + " WHERE " + rowSpec + ";");
-
-        long jsonParseCompletionTime = System.currentTimeMillis();
-
-        boolean operationResult = true;
-        MusicDataStoreHandle.getDSHandle().executePut(queryObject, insObj.getConsistencyInfo().get("type"));
-
-        long actualUpdateCompletionTime = System.currentTimeMillis();
-
-        long endTime = System.currentTimeMillis();
-
-        String timingString = "Time taken in ms for Cassandra " + consistency + UPDATE_CONST
-                        + operationId + ":" + "|total operation time:" + (endTime - startTime)
-                        + "|json parsing time:" + (jsonParseCompletionTime - startTime)
-                        + "|update time:" + (actualUpdateCompletionTime - jsonParseCompletionTime)
-                        + "|";
-        logger.info(EELFLoggerDelegate.applicationLogger,timingString);
-
-        return operationResult;
-    }
-}
diff --git a/src/test/java/org/onap/music/unittests/TestAPISuite.java b/src/test/java/org/onap/music/unittests/TestAPISuite.java
index 1ee4da38..65c8de6a 100644
--- a/src/test/java/org/onap/music/unittests/TestAPISuite.java
+++ b/src/test/java/org/onap/music/unittests/TestAPISuite.java
@@ -43,7 +43,8 @@ import com.datastax.driver.core.Row;
 import com.sun.jersey.core.util.Base64;
 
 @RunWith(Suite.class)
-@SuiteClasses({ TstRestMusicDataAPI.class, TstRestMusicLockAPI.class, TstRestMusicAdminAPI.class })
+@SuiteClasses({ TstRestMusicDataAPI.class, TstRestMusicLockAPI.class, TstRestMusicAdminAPI.class,
+    TstRestMusicConditionalAPI.class})
 public class TestAPISuite {
 
 	static String appName = "TestApp";
diff --git a/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java b/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java
index 00bb9412..b00c4fcc 100644
--- a/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java
+++ b/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java
@@ -58,36 +58,17 @@ import org.onap.music.datastore.jsonobjects.JsonInsert;
 import org.onap.music.datastore.jsonobjects.JsonKeySpace;
 import org.onap.music.datastore.jsonobjects.JsonLeasedLock;
 import org.onap.music.datastore.jsonobjects.JsonOnboard;
-import org.onap.music.datastore.jsonobjects.JsonSelect;
 import org.onap.music.datastore.jsonobjects.JsonTable;
-import org.onap.music.datastore.jsonobjects.JsonUpdate;
-import org.onap.music.exceptions.MusicServiceException;
-import org.onap.music.lockingservice.zookeeper.MusicLockingService;
 import org.onap.music.main.MusicCore;
 import org.onap.music.main.MusicUtil;
-import org.onap.music.main.ResultType;
 import org.onap.music.rest.RestMusicAdminAPI;
-import org.onap.music.rest.RestMusicBmAPI;
-import org.onap.music.rest.RestMusicDataAPI;
 import org.onap.music.rest.RestMusicHealthCheckAPI;
-import org.onap.music.rest.RestMusicLocksAPI;
-import org.onap.music.rest.RestMusicTestAPI;
-import org.onap.music.rest.RestMusicVersionAPI;
-import org.onap.music.service.impl.MusicZKCore;
-
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.datastax.driver.core.DataType;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
 import com.sun.jersey.core.util.Base64;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
 
-@Ignore //TODO need to resolve static calls to music authenticate
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-//@RunWith(PowerMockRunner.class)
-//@PowerMockRunnerDelegate(SpringJUnit4ClassRunner.class)
-//@PrepareForTest(MusicAuthentication.class)
 public class TstRestMusicAdminAPI {
 
     RestMusicAdminAPI admin = new RestMusicAdminAPI();
@@ -141,22 +122,13 @@ public class TstRestMusicAdminAPI {
         testObject = new PreparedQueryObject();
         testObject.appendQueryString("DROP KEYSPACE IF EXISTS " + keyspaceName);
         MusicCore.eventualPut(testObject);
-        testObject = new PreparedQueryObject();
-        testObject.appendQueryString("DROP KEYSPACE IF EXISTS admin");
-        MusicCore.eventualPut(testObject);
-        MusicDataStoreHandle.mDstoreHandle.close();
-    }
-
-    
-    //TODO FIX tests for admin
-    
+    }    
 
+    @Ignore
     @Test
     public void test6_onboard() throws Exception {
     	System.out.println("Testing application onboarding");
-    	
-    	authenticateTrue();
-    	
+    	    	
     	JsonOnboard jsonOnboard = new JsonOnboard();
     	jsonOnboard.setAppname("TestApp2");
     	jsonOnboard.setIsAAF("false"); jsonOnboard.setUserId("TestUser2");
@@ -170,9 +142,24 @@ public class TstRestMusicAdminAPI {
     			resultMap.get("Success")); */
     	assertEquals(200, response.getStatus());
     }
+    
+    @Test
+    public void test6_onboardCantReachAAF() throws Exception {
+        System.out.println("Testing application onboarding without reaching aaf");        
+        JsonOnboard jsonOnboard = new JsonOnboard();
+        jsonOnboard.setAppname("TestApp2");
+        jsonOnboard.setIsAAF("false"); jsonOnboard.setUserId("TestUser2");
+        jsonOnboard.setPassword("TestPassword2");
 
+        Response response = admin.onboardAppWithMusic(jsonOnboard,adminAuthorization);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        //TODO FIX when we can authenticate
+        assertEquals(401, response.getStatus());
+    }
+
+    @Ignore
 	@Test
-    public void Test6_onboard_duplicate() throws Exception {
+    public void test6_onboard_duplicate() throws Exception {
         JsonOnboard jsonOnboard = new JsonOnboard();
         jsonOnboard.setAppname("TestApp2");
         jsonOnboard.setIsAAF("false");
@@ -183,8 +170,9 @@ public class TstRestMusicAdminAPI {
     }
 
     // Missing appname
+	@Ignore
     @Test
-    public void Test6_onboard1() throws Exception {
+    public void test6_onboard1() throws Exception {
         JsonOnboard jsonOnboard = new JsonOnboard();
         jsonOnboard.setIsAAF("false");
         jsonOnboard.setUserId("TestUser2");
@@ -197,19 +185,23 @@ public class TstRestMusicAdminAPI {
 
 
     @Test
-    public void Test7_onboardSearch() throws Exception {
+    public void test7_onboardSearch() throws Exception {
+        System.out.println("Testing application onboarding search w/o reaching aaf");        
         JsonOnboard jsonOnboard = new JsonOnboard();
         jsonOnboard.setAppname("TestApp2");
         jsonOnboard.setIsAAF("false");
         jsonOnboard.setAid(onboardUUID);
-        Map<String, Object> resultMap = (Map<String, Object>) admin.getOnboardedInfoSearch(jsonOnboard,adminAuthorization).getEntity();
-        resultMap.containsKey("success");
-        assertEquals(null, resultMap.get(onboardUUID));
+        Response response = admin.getOnboardedInfoSearch(jsonOnboard,adminAuthorization);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        //TODO FIX when we can authenticate
+        //should be 401 error
+        assertEquals(204, response.getStatus());
     }
 
     // Missing appname
+    @Ignore
     @Test
-    public void Test7_onboardSearch1() throws Exception {
+    public void test7_onboardSearch1() throws Exception {
         JsonOnboard jsonOnboard = new JsonOnboard();
         jsonOnboard.setIsAAF("false");
         jsonOnboard.setAid(onboardUUID);
@@ -219,15 +211,17 @@ public class TstRestMusicAdminAPI {
         assertEquals(null, resultMap.get(onboardUUID));
     }
     
+    @Ignore
     @Test
-    public void Test7_onboardSearch_empty() throws Exception {
+    public void test7_onboardSearch_empty() throws Exception {
         JsonOnboard jsonOnboard = new JsonOnboard();
         Response response =  admin.getOnboardedInfoSearch(jsonOnboard,adminAuthorization);
       //  assertEquals(400, response.getStatus());
     }
 
+    @Ignore
     @Test
-    public void Test7_onboardSearch_invalidAid() throws Exception {
+    public void test7_onboardSearch_invalidAid() throws Exception {
         JsonOnboard jsonOnboard = new JsonOnboard();
         jsonOnboard.setAppname("TestApp2");
         jsonOnboard.setIsAAF("false");
@@ -236,8 +230,9 @@ public class TstRestMusicAdminAPI {
        // assertEquals(400, response.getStatus());
     }
 
+    @Ignore
     @Test
-    public void Test8_onboardUpdate() throws Exception {
+    public void test8_onboardUpdate() throws Exception {
         JsonOnboard jsonOnboard = new JsonOnboard();
         jsonOnboard.setIsAAF("false");
         jsonOnboard.setUserId("TestUser3");
@@ -248,10 +243,26 @@ public class TstRestMusicAdminAPI {
         resultMap.containsKey("success");
         assertNotNull(resultMap);
     }
+    
+    @Test
+    public void test8_onboardUpdateNoAAF() throws Exception {
+        System.out.println("Testing update application onboarding search w/o reaching aaf");
+        JsonOnboard jsonOnboard = new JsonOnboard();
+        jsonOnboard.setIsAAF("false");
+        jsonOnboard.setUserId("TestUser3");
+        jsonOnboard.setPassword("TestPassword3");
+        jsonOnboard.setAid(onboardUUID);
+        Response response = admin.updateOnboardApp(jsonOnboard,adminAuthorization);
+        
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        //Should be 401 error
+        assertEquals(204, response.getStatus());
+    }
 
     // Aid null
+    @Ignore
     @Test
-    public void Test8_onboardUpdate1() throws Exception {
+    public void test8_onboardUpdate1() throws Exception {
         JsonOnboard jsonOnboard = new JsonOnboard();
         jsonOnboard.setIsAAF("false");
         jsonOnboard.setUserId("TestUser3");
@@ -262,8 +273,9 @@ public class TstRestMusicAdminAPI {
     }
 
     // Appname not null
+    @Ignore
     @Test
-    public void Test8_onboardUpdate2() throws Exception {
+    public void test8_onboardUpdate2() throws Exception {
         JsonOnboard jsonOnboard = new JsonOnboard();
         jsonOnboard.setAppname("TestApp2");
         jsonOnboard.setIsAAF("false");
@@ -275,8 +287,9 @@ public class TstRestMusicAdminAPI {
     }
 
     // All null
+    @Ignore
     @Test
-    public void Test8_onboardUpdate3() throws Exception {
+    public void test8_onboardUpdate3() throws Exception {
         JsonOnboard jsonOnboard = new JsonOnboard();
         jsonOnboard.setAid(onboardUUID);
         Map<String, Object> resultMap = (Map<String, Object>) admin.updateOnboardApp(jsonOnboard,adminAuthorization).getEntity();
@@ -284,7 +297,7 @@ public class TstRestMusicAdminAPI {
     }
 
     @Test
-    public void Test9_onboardDelete() throws Exception {
+    public void test9_onboardDelete() throws Exception {
         JsonOnboard jsonOnboard = new JsonOnboard();
         jsonOnboard.setAppname("TestApp2");
         jsonOnboard.setAid(onboardUUID);
@@ -292,354 +305,26 @@ public class TstRestMusicAdminAPI {
         resultMap.containsKey("success");
         assertNotNull(resultMap);
     }
-
-    @Test
-    public void Test9_onboardDelete1() throws Exception {
-        JsonOnboard jsonOnboard = new JsonOnboard();
-        Map<String, Object> resultMap = (Map<String, Object>) admin.deleteOnboardApp(jsonOnboard,adminAuthorization).getEntity();
-        assertNotNull(resultMap);
-    }
-
-    //Music Health Check
-    @Test
-    public void Test3_HealthCheck_cassandra() {
-        String consistency = "ONE";
-        RestMusicHealthCheckAPI healthCheck = new RestMusicHealthCheckAPI();
-        HttpServletResponse servletResponse = Mockito.mock(HttpServletResponse.class);
-        Response response = healthCheck.cassandraStatus(servletResponse, consistency);
-        assertEquals(200, response.getStatus());
-    }
-
-    @Test
-    public void Test3_HealthCheck_cassandra_cosistencyQuorum() {
-        String consistency = "QUORUM";
-        RestMusicHealthCheckAPI healthCheck = new RestMusicHealthCheckAPI();
-        HttpServletResponse servletResponse = Mockito.mock(HttpServletResponse.class);
-        Response response = healthCheck.cassandraStatus(servletResponse, consistency);
-        assertEquals(200, response.getStatus());
-    }
-
-    @Ignore
-    @Test
-    public void Test3_HealthCheck_zookeeper() {
-        RestMusicHealthCheckAPI healthCheck = new RestMusicHealthCheckAPI();
-        HttpServletResponse servletResponse = Mockito.mock(HttpServletResponse.class);
-        Response response = healthCheck.ZKStatus(servletResponse);
-        assertEquals(200, response.getStatus());
-    }
-
-    @Ignore
-    public void Test4_pureZKcreate() throws Exception {
-        RestMusicBmAPI bmApi = new RestMusicBmAPI();
-        bmApi.pureZkCreate("sample");
-    }
-
     
-    @Ignore
-    public void Test4_pureZKUpdate() throws Exception {
-        RestMusicBmAPI bmApi = new RestMusicBmAPI();
-        bmApi.pureZkCreate("sample1");
-        JsonInsert jsonInsert = new JsonInsert();
-        Map<String, String> consistencyInfo = new HashMap<>();
-        Map<String, Object> values = new HashMap<>();
-        values.put("uuid", "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6");
-        values.put("emp_name", "testName_create");
-        values.put("emp_salary", 500);
-        consistencyInfo.put("type", "eventual");
-        jsonInsert.setConsistencyInfo(consistencyInfo);
-        jsonInsert.setKeyspaceName(keyspaceName);
-        jsonInsert.setTableName(tableName);
-        jsonInsert.setValues(values);
-        bmApi.pureZkUpdate(jsonInsert, "sampleNode1");
-    }
-
-    @Ignore
-    public void Test4_pureZKGet() throws Exception {
-        RestMusicBmAPI bmApi = new RestMusicBmAPI();
-        bmApi.pureZkGet("sample");
-    }
-
-    /*
-     * @Test public void Test5_ZKAtomicPut_atomic() throws Exception {
-     * RestMusicBmAPI bmApi = new RestMusicBmAPI(); JsonInsert jsonInsert = new
-     * JsonInsert(); Map<String, String> consistencyInfo = new HashMap<>();
-     * Map<String, Object> values = new HashMap<>(); values.put("uuid",
-     * "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6"); values.put("emp_name",
-     * "testName_create"); values.put("emp_salary", 1500);
-     * consistencyInfo.put("type", "atomic");
-     * jsonInsert.setConsistencyInfo(consistencyInfo);
-     * jsonInsert.setKeyspaceName(keyspaceName); jsonInsert.setTableName(tableName);
-     * jsonInsert.setValues(values); bmApi.pureZkAtomicPut(jsonInsert, lockName,
-     * "sampleNode1"); }
-     */
-    /*
-     * @Test public void Test5_ZKAtomicPut_atomic_with_delete() throws Exception {
-     * RestMusicBmAPI bmApi = new RestMusicBmAPI(); JsonInsert jsonInsert = new
-     * JsonInsert(); Map<String, String> consistencyInfo = new HashMap<>();
-     * Map<String, Object> values = new HashMap<>(); values.put("uuid",
-     * "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6"); values.put("emp_name",
-     * "testName_create"); values.put("emp_salary", 1500);
-     * consistencyInfo.put("type", "atomic_delete_lock");
-     * jsonInsert.setConsistencyInfo(consistencyInfo);
-     * jsonInsert.setKeyspaceName(keyspaceName); jsonInsert.setTableName(tableName);
-     * jsonInsert.setValues(values); bmApi.pureZkAtomicPut(jsonInsert, lockName,
-     * "sampleNode1"); }
-     */
-
-    /*
-     * @Test public void Test5_ZKAtomicGet_atomic() throws Exception {
-     * RestMusicBmAPI bmApi = new RestMusicBmAPI(); JsonInsert jsonInsert = new
-     * JsonInsert(); Map<String, String> consistencyInfo = new HashMap<>();
-     * Map<String, Object> values = new HashMap<>(); values.put("uuid",
-     * "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6"); values.put("emp_name",
-     * "testName_create"); values.put("emp_salary", 1500);
-     * consistencyInfo.put("type", "atomic_delete_lock");
-     * jsonInsert.setConsistencyInfo(consistencyInfo);
-     * jsonInsert.setKeyspaceName(keyspaceName); jsonInsert.setTableName(tableName);
-     * jsonInsert.setValues(values); bmApi.pureZkAtomicGet(jsonInsert, lockName,
-     * "sampleNode1"); }
-     */
-
-    /*
-     * @Test public void Test5_ZKAtomicGet_atomic_with_delete() throws Exception {
-     * RestMusicBmAPI bmApi = new RestMusicBmAPI(); JsonInsert jsonInsert = new
-     * JsonInsert(); Map<String, String> consistencyInfo = new HashMap<>();
-     * Map<String, Object> values = new HashMap<>(); values.put("uuid",
-     * "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6"); values.put("emp_name",
-     * "testName_create"); values.put("emp_salary", 1500);
-     * consistencyInfo.put("type", "atomic_delete_lock");
-     * jsonInsert.setConsistencyInfo(consistencyInfo);
-     * jsonInsert.setKeyspaceName(keyspaceName); jsonInsert.setTableName(tableName);
-     * jsonInsert.setValues(values); bmApi.pureZkAtomicGet(jsonInsert, lockName,
-     * "sampleNode1"); }
-     */
-
-    @Ignore
-    @Test
-    public void Test5_updateCassa() throws Exception {
-        RestMusicBmAPI bmApi = new RestMusicBmAPI();
-        JsonInsert jsonInsert = new JsonInsert();
-        Map<String, String> consistencyInfo = new HashMap<>();
-        Map<String, Object> values = new HashMap<>();
-        values.put("emp_salary", 1500);
-        consistencyInfo.put("type", "eventual");
-        jsonInsert.setConsistencyInfo(consistencyInfo);
-        jsonInsert.setKeyspaceName(keyspaceName);
-        jsonInsert.setTableName(tableName);
-        jsonInsert.setValues(values);
-        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
-        row.add("emp_name", "testName_create");
-        Mockito.when(info.getQueryParameters()).thenReturn(row);
-        //bmApi.updateTableCassa(jsonInsert, keyspaceName, tableName, info);
-    }
-
-    // RestMusicConditional
-    @Test
-    public void Test5_createTable_conditional() throws Exception {
-        JsonTable jsonTable = new JsonTable();
-        Map<String, String> consistencyInfo = new HashMap<>();
-        Map<String, String> fields = new HashMap<>();
-        fields.put("id", "text");
-        fields.put("plans", "Map<text,text>");
-        fields.put("PRIMARY KEY", "(id)");
-        consistencyInfo.put("type", "eventual");
-        jsonTable.setConsistencyInfo(consistencyInfo);
-        jsonTable.setKeyspaceName(keyspaceName);
-        jsonTable.setPrimaryKey("id");
-        jsonTable.setTableName(tableNameConditional);
-        jsonTable.setFields(fields);
-        Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-        /*Response response = data.createTable("1", "1", "1",
-                        "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",appName, authorization,
-                        jsonTable, keyspaceName, tableNameConditional);
-        System.out.println("#######status is " + response.getStatus());
-        System.out.println("Entity" + response.getEntity());
-        //assertEquals(200, response.getStatus());
-        assertEquals(401, response.getStatus());
-        */
-    }
-
-    @Test
-    public void Test6_insertConditional() throws Exception {
-        RestMusicConditionalAPI conditionalApi = new RestMusicConditionalAPI();
-        JsonConditional json = new JsonConditional();
-        json.setPrimaryKey("id");
-        json.setPrimaryKeyValue("123|abc|port");
-        json.setCasscadeColumnName("plans");
-        Map<String, Object> tableValues =  new HashMap<>();
-        tableValues.put("id", "123|abc|port");
-        json.setTableValues(tableValues);
-        Map<String, Object> columnData =  new HashMap<>();
-        Map<String, String> column =  new HashMap<>();
-        column.put("created", "time");
-        columnData.put("key", "P2");
-        columnData.put("value", column);
-        json.setCasscadeColumnData(columnData);
-        Map<String, String> cond = new HashMap<>();
-        Map<String, String> cond1 = new HashMap<>();
-        Map<String, Map<String, String>> conditions = new HashMap<String, Map<String, String>>();
-        cond.put("status", "under-spin-up");
-        cond1.put("status", "parked");
-        conditions.put("exists", cond);
-        conditions.put("nonexists", cond1);
-        json.setConditions(conditions);
-        Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-        Response response = conditionalApi.insertConditional("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
-                appName, authorization, keyspaceName, tableNameConditional, json);
-        assertEquals(401, response.getStatus());
-    }
-
     @Test
-    public void Test6_insertConditional_primaryKey_null() throws Exception {
-        RestMusicConditionalAPI conditionalApi = new RestMusicConditionalAPI();
-        JsonConditional json = new JsonConditional();
-        json.setPrimaryKeyValue("123|abc|port");
-        json.setCasscadeColumnName("plans");
-        Map<String, Object> tableValues =  new HashMap<>();
-        tableValues.put("id", "123|abc|port");
-        json.setTableValues(tableValues);
-        Map<String, Object> columnData =  new HashMap<>();
-        Map<String, String> column =  new HashMap<>();
-        column.put("created", "time");
-        columnData.put("key", "P2");
-        columnData.put("value", column);
-        json.setCasscadeColumnData(columnData);
-        Map<String, String> cond = new HashMap<>();
-        Map<String, String> cond1 = new HashMap<>();
-        Map<String, Map<String, String>> conditions = new HashMap<String, Map<String, String>>();
-        cond.put("status", "under-spin-up");
-        cond1.put("status", "parked");
-        conditions.put("exists", cond);
-        conditions.put("nonexists", cond1);
-        json.setConditions(conditions);
-        Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-        Response response = conditionalApi.insertConditional("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
-                appName, authorization, keyspaceName, tableNameConditional, json);
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void Test6_insertConditional_wrongAuth() throws Exception {
-        RestMusicConditionalAPI conditionalApi = new RestMusicConditionalAPI();
-        JsonConditional json = new JsonConditional();
-        json.setPrimaryKey("id");
-        json.setPrimaryKeyValue("123|abc|port");
-        json.setCasscadeColumnName("plans");
-        Map<String, Object> tableValues =  new HashMap<>();
-        tableValues.put("id", "123|abc|port");
-        json.setTableValues(tableValues);
-        Map<String, Object> columnData =  new HashMap<>();
-        Map<String, String> column =  new HashMap<>();
-        column.put("created", "time");
-        columnData.put("key", "P2");
-        columnData.put("value", column);
-        json.setCasscadeColumnData(columnData);
-        Map<String, String> cond = new HashMap<>();
-        Map<String, String> cond1 = new HashMap<>();
-        Map<String, Map<String, String>> conditions = new HashMap<String, Map<String, String>>();
-        cond.put("status", "under-spin-up");
-        cond1.put("status", "parked");
-        conditions.put("exists", cond);
-        conditions.put("nonexists", cond1);
-        json.setConditions(conditions);
-        Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-        Response response = conditionalApi.insertConditional("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
-                appName, wrongAuthorization, keyspaceName, tableNameConditional, json);
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void Test7_updateConditional() throws Exception {
-        RestMusicConditionalAPI conditionalApi = new RestMusicConditionalAPI();
-        JsonConditional json = new JsonConditional();
-        json.setPrimaryKey("id");
-        json.setPrimaryKeyValue("123|abc|port");
-        json.setCasscadeColumnName("plans");
-        Map<String, Object> tableValues =  new HashMap<>();
-        tableValues.put("id", "123|abc|port");
-        json.setTableValues(tableValues);
-        Map<String, Object> columnData =  new HashMap<>();
-        Map<String, String> column =  new HashMap<>();
-        column.put("created", "time");
-        columnData.put("key", "P2");
-        columnData.put("value", column);
-        json.setCasscadeColumnData(columnData);
-        Map<String, String> cond = new HashMap<>();
-        Map<String, String> cond1 = new HashMap<>();
-        Map<String, Map<String, String>> conditions = new HashMap<String, Map<String, String>>();
-        cond.put("updated", "new time");
-        conditions.put("exists", cond);
-        conditions.put("nonexists", cond1);
-        json.setConditions(conditions);
-        Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-        Response response = conditionalApi.updateConditional("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
-                appName, authorization, keyspaceName, tableNameConditional, json);
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void Test7_updateConditional_wrongAuth() throws Exception {
-        RestMusicConditionalAPI conditionalApi = new RestMusicConditionalAPI();
-        JsonConditional json = new JsonConditional();
-        json.setPrimaryKey("id");
-        json.setPrimaryKeyValue("123|abc|port");
-        json.setCasscadeColumnName("plans");
-        Map<String, Object> tableValues =  new HashMap<>();
-        tableValues.put("id", "123|abc|port");
-        json.setTableValues(tableValues);
-        Map<String, Object> columnData =  new HashMap<>();
-        Map<String, String> column =  new HashMap<>();
-        column.put("created", "time");
-        columnData.put("key", "P2");
-        columnData.put("value", column);
-        json.setCasscadeColumnData(columnData);
-        Map<String, String> cond = new HashMap<>();
-        Map<String, String> cond1 = new HashMap<>();
-        Map<String, Map<String, String>> conditions = new HashMap<String, Map<String, String>>();
-        cond.put("updated", "new time");
-        conditions.put("exists", cond);
-        conditions.put("nonexists", cond1);
-        json.setConditions(conditions);
-        Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-        Response response = conditionalApi.updateConditional("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
-                appName, wrongAuthorization, keyspaceName, tableNameConditional, json);
-        assertEquals(401, response.getStatus());
+    public void test9_onboardDeleteNoAAF() throws Exception {
+        System.out.println("Testing onboard delete without aaf");
+        JsonOnboard jsonOnboard = new JsonOnboard();
+        jsonOnboard.setAppname("TestApp2");
+        jsonOnboard.setAid(onboardUUID);
+        Response response = admin.deleteOnboardApp(jsonOnboard,adminAuthorization);
+        
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        //Should be 401 error
+        assertEquals(204, response.getStatus());
     }
 
-    @Test
-    public void Test7_updateConditional_primarykey_null() throws Exception {
-        RestMusicConditionalAPI conditionalApi = new RestMusicConditionalAPI();
-        JsonConditional json = new JsonConditional();
-        json.setPrimaryKeyValue("123|abc|port");
-        json.setCasscadeColumnName("plans");
-        Map<String, Object> tableValues =  new HashMap<>();
-        tableValues.put("id", "123|abc|port");
-        json.setTableValues(tableValues);
-        Map<String, Object> columnData =  new HashMap<>();
-        Map<String, String> column =  new HashMap<>();
-        column.put("created", "time");
-        columnData.put("key", "P2");
-        columnData.put("value", column);
-        json.setCasscadeColumnData(columnData);
-        Map<String, String> cond = new HashMap<>();
-        Map<String, String> cond1 = new HashMap<>();
-        Map<String, Map<String, String>> conditions = new HashMap<String, Map<String, String>>();
-        cond.put("updated", "new time");
-        conditions.put("exists", cond);
-        conditions.put("nonexists", cond1);
-        json.setConditions(conditions);
-        Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-        Response response = conditionalApi.updateConditional("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
-                appName, authorization, keyspaceName, tableNameConditional, json);
-        assertEquals(401, response.getStatus());
-    }
-    
     @Ignore
     @Test
-    public void Test8_HealthCheck_cassandra_musicHealthCheck() {
-        RestMusicHealthCheckAPI healthCheck = new RestMusicHealthCheckAPI();
-        Response response = healthCheck.musicHealthCheck();
-        assertEquals(200, response.getStatus());
+    public void test9_onboardDelete1() throws Exception {
+        JsonOnboard jsonOnboard = new JsonOnboard();
+        Map<String, Object> resultMap = (Map<String, Object>) admin.deleteOnboardApp(jsonOnboard,adminAuthorization).getEntity();
+        assertNotNull(resultMap);
     }
     
     
@@ -675,13 +360,5 @@ public class TstRestMusicAdminAPI {
 			System.out.println("#######UUID is:" + rows.get(0).getUUID("uuid"));
 		}
 	}
-    
-    /**
-     * Confirm an authentication
-     * @throws Exception 
-     */
-    private void authenticateTrue() throws Exception {
-		//PowerMockito.when(MusicAuthentication.authenticateAdmin(Mockito.anyString())).thenReturn(true);
-	}
    
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/music/unittests/TstRestMusicConditionalAPI.java b/src/test/java/org/onap/music/unittests/TstRestMusicConditionalAPI.java
new file mode 100644
index 00000000..1f0e24c2
--- /dev/null
+++ b/src/test/java/org/onap/music/unittests/TstRestMusicConditionalAPI.java
@@ -0,0 +1,476 @@
+/*
+ * ============LICENSE_START========================================== org.onap.music
+ * =================================================================== Copyright (c) 2017 AT&T
+ * Intellectual Property ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * 
+ * ============LICENSE_END=============================================
+ * ====================================================================
+ */
+
+package org.onap.music.unittests;
+
+import static org.junit.Assert.assertEquals;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mindrot.jbcrypt.BCrypt;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.music.conductor.conditionals.JsonConditional;
+import org.onap.music.conductor.conditionals.RestMusicConditionalAPI;
+import org.onap.music.datastore.MusicDataStoreHandle;
+import org.onap.music.datastore.PreparedQueryObject;
+import org.onap.music.datastore.jsonobjects.JsonDelete;
+import org.onap.music.datastore.jsonobjects.JsonInsert;
+import org.onap.music.datastore.jsonobjects.JsonKeySpace;
+import org.onap.music.datastore.jsonobjects.JsonSelect;
+import org.onap.music.datastore.jsonobjects.JsonTable;
+import org.onap.music.datastore.jsonobjects.JsonUpdate;
+import org.onap.music.exceptions.MusicServiceException;
+import org.onap.music.main.CachingUtil;
+import org.onap.music.main.MusicCore;
+import org.onap.music.main.MusicUtil;
+import org.onap.music.main.ResultType;
+import org.onap.music.rest.RestMusicDataAPI;
+import com.datastax.driver.core.DataType;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Row;
+import com.sun.jersey.core.util.Base64;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TstRestMusicConditionalAPI {
+
+    RestMusicDataAPI data = new RestMusicDataAPI();
+	RestMusicConditionalAPI cond = new RestMusicConditionalAPI();
+	static PreparedQueryObject testObject;
+
+	@Mock
+	HttpServletResponse http;
+
+	@Mock
+	UriInfo info;
+
+	static String appName = "TestApp";
+	static String userId = "TestUser";
+	static String password = "TestPassword";
+	static String authData = userId+":"+password;
+	static String wrongAuthData = userId+":"+"pass";
+	static String authorization = new String(Base64.encode(authData.getBytes()));
+	static String wrongAuthorization = new String(Base64.encode(wrongAuthData.getBytes()));
+	static boolean isAAF = false;
+	static UUID uuid = UUID.fromString("abc66ccc-d857-4e90-b1e5-df98a3d40ce6");
+	static String keyspaceName = "testcassa";
+	static String tableName = "employees";
+	static String xLatestVersion = "X-latestVersion";
+	static String onboardUUID = null;
+
+	@BeforeClass
+	public static void init() throws Exception {
+		System.out.println("Testing RestMusicConditional class");
+		try {
+			createKeyspace();
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new Exception("Unable to initialize before TestRestMusicData test class. " + e.getMessage());
+		}
+	}
+	
+	@After
+	public void afterEachTest( ) throws MusicServiceException {
+		clearAllTablesFromKeyspace();
+	}
+
+	@AfterClass
+	public static void tearDownAfterClass() throws Exception {
+		testObject = new PreparedQueryObject();
+		testObject.appendQueryString("DROP KEYSPACE IF EXISTS " + keyspaceName);
+		MusicCore.eventualPut(testObject);
+	}
+	
+	@Test
+	public void test_insertIntoTable() throws Exception {
+		System.out.println("Testing conditional insert into table");
+		createTable();
+		
+		JsonConditional jsonCond = new JsonConditional();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, Object> values = new HashMap<>();
+        values.put("id", "test_id");
+        consistencyInfo.put("type", "eventual");
+        HashMap<String, Object> cascadeData = new HashMap<>();
+        HashMap<String, String> cascadeValue = new HashMap<>();
+        cascadeValue.put("created", "hello");
+        cascadeValue.put("updated", "world");
+        cascadeData.put("key", "p1");
+        cascadeData.put("value", cascadeValue);
+        HashMap<String, Map<String, String>> condition = new HashMap<>();
+        HashMap<String, String> exists = new HashMap<>();
+        exists.put("status", "parked");
+        HashMap<String, String> nonexists = new HashMap<>();
+        nonexists.put("status", "underway");
+        condition.put("exists", exists);
+        condition.put("nonexists", nonexists);
+        
+        jsonCond.setPrimaryKey("id");
+        jsonCond.setPrimaryKeyValue("testname");
+        jsonCond.setCasscadeColumnName("plans");
+        jsonCond.setTableValues(values);
+        jsonCond.setCasscadeColumnData(cascadeData);
+        jsonCond.setConditions(condition);
+
+		Response response = cond.insertConditional("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
+		        appName, authorization, keyspaceName, tableName, jsonCond);
+
+		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+		assertEquals(200, response.getStatus());
+	}
+/*
+	@Test
+	public void test4_insertIntoTable2() throws Exception {
+		System.out.println("Testing insert into table #2");
+		createTable();
+		JsonInsert jsonInsert = new JsonInsert();
+		Map<String, String> consistencyInfo = new HashMap<>();
+		Map<String, Object> values = new HashMap<>();
+		values.put("uuid", "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6");
+		values.put("emp_name", "test1");
+		values.put("emp_salary", 1500);
+		consistencyInfo.put("type", "eventual");
+		jsonInsert.setConsistencyInfo(consistencyInfo);
+		jsonInsert.setKeyspaceName(keyspaceName);
+		jsonInsert.setTableName(tableName);
+		jsonInsert.setValues(values);
+		Response response = data.insertIntoTable("1", "1", "1",
+				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
+				jsonInsert, keyspaceName, tableName);
+		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+		
+		assertEquals(200, response.getStatus());
+	}
+
+	// Auth Error
+	@Test
+	public void test4_insertIntoTable3() throws Exception {
+		System.out.println("Testing insert into table with bad credentials");
+		createTable();
+		JsonInsert jsonInsert = new JsonInsert();
+		Map<String, String> consistencyInfo = new HashMap<>();
+		Map<String, Object> values = new HashMap<>();
+		values.put("uuid", "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6");
+		values.put("emp_name", "test1");
+		values.put("emp_salary", 1500);
+		consistencyInfo.put("type", "eventual");
+		jsonInsert.setConsistencyInfo(consistencyInfo);
+		jsonInsert.setKeyspaceName(keyspaceName);
+		jsonInsert.setTableName(tableName);
+		jsonInsert.setValues(values);
+		Response response = data.insertIntoTable("1", "1", "1",
+				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, wrongAuthorization,
+				jsonInsert, keyspaceName, tableName);
+		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+		assertEquals(401, response.getStatus());
+	}
+
+	// Table wrong
+	@Test
+	public void test4_insertIntoTable4() throws Exception {
+		System.out.println("Testing insert into wrong table");
+		createTable();
+		JsonInsert jsonInsert = new JsonInsert();
+		Map<String, String> consistencyInfo = new HashMap<>();
+		Map<String, Object> values = new HashMap<>();
+		values.put("uuid", "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6");
+		values.put("emp_name", "test1");
+		values.put("emp_salary", 1500);
+		consistencyInfo.put("type", "eventual");
+		jsonInsert.setConsistencyInfo(consistencyInfo);
+		jsonInsert.setKeyspaceName(keyspaceName);
+		jsonInsert.setTableName(tableName);
+		jsonInsert.setValues(values);
+		Response response = data.insertIntoTable("1", "1", "1",
+				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
+				jsonInsert, keyspaceName, "wrong");
+		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+		assertEquals(400, response.getStatus());
+	}
+*/
+
+	@Test
+	public void test5_updateTable() throws Exception {
+		System.out.println("Testing conditional update table");
+		createAndInsertIntoTable();
+		
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "eventual");
+        
+        JsonConditional jsonCond = new JsonConditional();
+        Map<String, Object> values = new HashMap<>();
+        values.put("id", "test_id");
+        HashMap<String, Object> cascadeData = new HashMap<>();
+        HashMap<String, String> cascadeValue = new HashMap<>();
+        cascadeValue.put("created", "hello");
+        cascadeValue.put("updated", "world");
+        cascadeData.put("key", "p1");
+        cascadeData.put("value", cascadeValue);
+        
+        jsonCond.setPrimaryKey("id");
+        jsonCond.setPrimaryKeyValue("test_id");
+        jsonCond.setCasscadeColumnName("plans");
+        jsonCond.setTableValues(values);
+        jsonCond.setCasscadeColumnData(cascadeData);
+		
+		Response response = cond.updateConditional("1", "1", "1",
+		        "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
+		        keyspaceName, tableName, jsonCond);
+		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+		
+		assertEquals(200, response.getStatus());
+	} 
+/*
+	// need mock code to create error for MusicCore methods
+	@Test
+	public void test5_updateTableAuthE() throws Exception {
+		System.out.println("Testing update table #2");
+		createTable();
+		//MockitoAnnotations.initMocks(this);
+		JsonUpdate jsonUpdate = new JsonUpdate();
+		Map<String, String> consistencyInfo = new HashMap<>();
+		MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+		Map<String, Object> values = new HashMap<>();
+		row.add("emp_name", "testname");
+		values.put("emp_salary", 2500);
+		consistencyInfo.put("type", "atomic");
+		jsonUpdate.setConsistencyInfo(consistencyInfo);
+		jsonUpdate.setKeyspaceName(keyspaceName);
+		jsonUpdate.setTableName(tableName);
+		jsonUpdate.setValues(values);
+		//add ttl & timestamp
+		//Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
+		Mockito.when(info.getQueryParameters()).thenReturn(row);
+		//Map<String, Object> m1= new HashMap<>() ;
+		//Mockito.when(MusicCore.autheticateUser(appName,userId,password,keyspaceName,"abc66ccc-d857-4e90-b1e5-df98a3d40ce6","updateTable")).thenReturn(m1);
+		Response response = data.updateTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+				authorization, jsonUpdate, keyspaceName, tableName, info);
+		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+		assertEquals(200, response.getStatus());
+	} 
+
+	@Ignore
+	@Test
+	public void test5_updateTableAuthException1() throws Exception {
+		System.out.println("Testing update table authentication error");
+		createTable();
+		JsonUpdate jsonUpdate = new JsonUpdate();
+		Map<String, String> consistencyInfo = new HashMap<>();
+		MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+		Map<String, Object> values = new HashMap<>();
+		row.add("emp_name", "testname");
+		values.put("emp_salary", 2500);
+		consistencyInfo.put("type", "atomic");
+		jsonUpdate.setConsistencyInfo(consistencyInfo);
+		jsonUpdate.setKeyspaceName(keyspaceName);
+		jsonUpdate.setTableName(tableName);
+		jsonUpdate.setValues(values);
+		
+		Mockito.when(info.getQueryParameters()).thenReturn(row);
+		String authDatax = ":";
+		String authorizationx = new String(Base64.encode(authDatax.getBytes()));
+		Response response = data.updateTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+				authorizationx, jsonUpdate, keyspaceName, tableName, info);
+		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+		assertEquals(401, response.getStatus());
+	}
+
+	@Ignore
+	@Test
+	public void test5_updateTableAuthEmpty() throws Exception {
+		System.out.println("Testing update table without authentication");
+		createTable();
+		
+		JsonUpdate jsonUpdate = new JsonUpdate();
+		Map<String, String> consistencyInfo = new HashMap<>();
+		MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+		Map<String, Object> values = new HashMap<>();
+		row.add("emp_name", "testname");
+		values.put("emp_salary", 2500);
+		consistencyInfo.put("type", "atomic");
+		jsonUpdate.setConsistencyInfo(consistencyInfo);
+		jsonUpdate.setKeyspaceName(keyspaceName);
+		jsonUpdate.setTableName(tableName);
+		jsonUpdate.setValues(values);
+
+		Mockito.when(info.getQueryParameters()).thenReturn(row);
+		String authDatax =":"+password;
+		String authorizationx = new String(Base64.encode(authDatax.getBytes()));
+		String appNamex="xx";
+		Response response = data.updateTable("1", "1", "1", "", appNamex,
+				authorizationx, jsonUpdate, keyspaceName, tableName, info);
+		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+		assertEquals(401, response.getStatus());
+	}
+
+*/
+	
+	private static void createAdminTable() throws Exception {
+		testObject = new PreparedQueryObject();
+		testObject.appendQueryString(CassandraCQL.createAdminKeyspace);
+		MusicCore.eventualPut(testObject);
+		testObject = new PreparedQueryObject();
+		testObject.appendQueryString(CassandraCQL.createAdminTable);
+		MusicCore.eventualPut(testObject);
+
+		testObject = new PreparedQueryObject();
+		testObject.appendQueryString(
+				"INSERT INTO admin.keyspace_master (uuid, keyspace_name, application_name, is_api, "
+						+ "password, username, is_aaf) VALUES (?,?,?,?,?,?,?)");
+		testObject.addValue(MusicUtil.convertToActualDataType(DataType.uuid(), uuid));
+		testObject.addValue(MusicUtil.convertToActualDataType(DataType.text(),
+				MusicUtil.DEFAULTKEYSPACENAME));
+		testObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
+		testObject.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), "True"));
+		testObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), BCrypt.hashpw(password, BCrypt.gensalt())));
+		testObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), userId));
+		testObject.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), isAAF));
+		MusicCore.eventualPut(testObject);
+
+		testObject = new PreparedQueryObject();
+		testObject.appendQueryString(
+				"select uuid from admin.keyspace_master where application_name = ? allow filtering");
+		testObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
+		ResultSet rs = MusicCore.get(testObject);
+		List<Row> rows = rs.all();
+		if (rows.size() > 0) {
+			System.out.println("#######UUID is:" + rows.get(0).getUUID("uuid"));
+		}
+	}
+	
+
+	private static void createKeyspace() throws Exception {
+		//shouldn't really be doing this here, but create keyspace is currently turned off
+		PreparedQueryObject query = new PreparedQueryObject();
+		query.appendQueryString(CassandraCQL.createKeySpace);
+		MusicCore.eventualPut(query);
+		
+		boolean isAAF = false;
+        String hashedpwd = BCrypt.hashpw(password, BCrypt.gensalt());
+        query = new PreparedQueryObject();
+        query.appendQueryString(
+                    "INSERT into admin.keyspace_master (uuid, keyspace_name, application_name, is_api, "
+                                    + "password, username, is_aaf) values (?,?,?,?,?,?,?)");
+        query.addValue(MusicUtil.convertToActualDataType(DataType.uuid(), uuid));
+        query.addValue(MusicUtil.convertToActualDataType(DataType.text(), keyspaceName));
+        query.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
+        query.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), "True"));
+        query.addValue(MusicUtil.convertToActualDataType(DataType.text(), hashedpwd));
+        query.addValue(MusicUtil.convertToActualDataType(DataType.text(), userId));
+        query.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), isAAF));
+        CachingUtil.updateMusicCache(keyspaceName, appName);
+        CachingUtil.updateMusicValidateCache(appName, userId, hashedpwd);
+        MusicCore.eventualPut(query);
+	}
+	
+	private void clearAllTablesFromKeyspace() throws MusicServiceException {
+		ArrayList<String> tableNames = new ArrayList<>();
+		PreparedQueryObject query = new PreparedQueryObject();
+		query.appendQueryString("SELECT table_name FROM system_schema.tables WHERE keyspace_name = '"+keyspaceName+"';");
+		ResultSet rs = MusicCore.get(query);
+		for (Row row: rs) {
+			tableNames.add(row.getString("table_name"));
+		}
+		for (String table: tableNames) {
+			query = new PreparedQueryObject();
+			query.appendQueryString("DROP TABLE " + keyspaceName + "." + table);
+			MusicCore.eventualPut(query);
+		}
+	}
+	
+	/**
+	 * Create a table {@link tableName} in {@link keyspaceName}
+	 * @throws Exception
+	 */
+	private void createTable() throws Exception {
+		JsonTable jsonTable = new JsonTable();
+		Map<String, String> consistencyInfo = new HashMap<>();
+		Map<String, String> fields = new HashMap<>();
+		fields.put("id", "text");
+		fields.put("plans", "map<text,text>");
+		fields.put("PRIMARY KEY", "(id)");
+		consistencyInfo.put("type", "eventual");
+		jsonTable.setConsistencyInfo(consistencyInfo);
+		jsonTable.setKeyspaceName(keyspaceName);
+		jsonTable.setPrimaryKey("id");
+		jsonTable.setTableName(tableName);
+		jsonTable.setFields(fields);
+		Response response = data.createTable("1", "1", "1",
+				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6",appName, authorization, 
+				jsonTable, keyspaceName, tableName);
+	}
+	
+	/**
+	 * Create table {@link createTable} and insert into said table
+	 * @throws Exception
+	 */
+	private void createAndInsertIntoTable() throws Exception {
+		createTable();
+		
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "eventual");
+        JsonConditional jsonCond = new JsonConditional();
+        Map<String, Object> values = new HashMap<>();
+        values.put("id", "test_id");
+        HashMap<String, Object> cascadeData = new HashMap<>();
+        HashMap<String, String> cascadeValue = new HashMap<>();
+        cascadeValue.put("created", "hello");
+        cascadeValue.put("updated", "world");
+        cascadeData.put("key", "p1");
+        cascadeData.put("value", cascadeValue);
+        HashMap<String, Map<String, String>> condition = new HashMap<>();
+        HashMap<String, String> exists = new HashMap<>();
+        exists.put("status", "parked");
+        HashMap<String, String> nonexists = new HashMap<>();
+        nonexists.put("status", "underway");
+        condition.put("exists", exists);
+        condition.put("nonexists", nonexists);
+        
+        jsonCond.setPrimaryKey("id");
+        jsonCond.setPrimaryKeyValue("test_id");
+        jsonCond.setCasscadeColumnName("plans");
+        jsonCond.setTableValues(values);
+        jsonCond.setCasscadeColumnData(cascadeData);
+        jsonCond.setConditions(condition);
+
+        Response response = cond.insertConditional("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
+                appName, authorization, keyspaceName, tableName, jsonCond);
+	}
+}
diff --git a/src/test/java/org/onap/music/unittests/TstRestMusicDataAPI.java b/src/test/java/org/onap/music/unittests/TstRestMusicDataAPI.java
index d263ef9f..0f0545e8 100644
--- a/src/test/java/org/onap/music/unittests/TstRestMusicDataAPI.java
+++ b/src/test/java/org/onap/music/unittests/TstRestMusicDataAPI.java
@@ -152,6 +152,29 @@ public class TstRestMusicDataAPI {
 		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
 		assertEquals(200, response.getStatus());
 	}
+	
+	@Test
+    public void test3_createTableNoName() throws Exception {
+        System.out.println("Testing create table without name");
+        JsonTable jsonTable = new JsonTable();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, String> fields = new HashMap<>();
+        fields.put("uuid", "text");
+        fields.put("emp_name", "text");
+        fields.put("emp_salary", "varint");
+        fields.put("PRIMARY KEY", "(emp_name)");
+        consistencyInfo.put("type", "eventual");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        jsonTable.setKeyspaceName(keyspaceName);
+        jsonTable.setPrimaryKey("emp_name");
+        jsonTable.setTableName("");
+        jsonTable.setFields(fields);
+        Response response = data.createTable("1", "1", "1",
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",appName, authorization, 
+                jsonTable, keyspaceName, "");
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(400, response.getStatus());
+    }
 
 
 	@Test
@@ -464,6 +487,40 @@ public class TstRestMusicDataAPI {
 
 		assertEquals(200, response.getStatus());
 	}
+	
+	// create index without table name
+    @Test
+    public void test3_createTableIndexNoName() throws Exception {
+        System.out.println("Testing index in create table w/o tablename");
+        String tableNameC ="testTableCinx";
+        JsonTable jsonTable = new JsonTable();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, String> fields = new HashMap<>();
+        fields.put("uuid", "text");
+        fields.put("emp_name", "text");
+        fields.put("emp_salary", "varint");
+        fields.put("PRIMARY KEY", "((emp_name),emp_salary)");
+        consistencyInfo.put("type", "eventual");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        jsonTable.setKeyspaceName(keyspaceName);
+        jsonTable.setTableName(tableNameC);
+        jsonTable.setClusteringOrder("emp_salary ASC");
+        jsonTable.setFields(fields);
+        Response response = data.createTable("1", "1", "1",
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
+                jsonTable, keyspaceName, tableNameC);
+        // if 200 print to log otherwise fail assertEquals(200, response.getStatus());
+        // info.setQueryParameters("index_name=inx_uuid");
+        Map<String,String> queryParametersMap =new HashMap<String, String>();
+
+        queryParametersMap.put("index_name","inxuuid");
+        response = data.createIndex("1", "1", "1",
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
+                "", "","uuid",info);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
 
 	@Test
 	public void test4_insertIntoTable() throws Exception {
@@ -486,6 +543,50 @@ public class TstRestMusicDataAPI {
 
 		assertEquals(200, response.getStatus());
 	}
+	
+	@Test
+    public void test4_insertIntoTableCriticalNoLockID() throws Exception {
+        System.out.println("Testing atomic insert into table without lockid");
+        createTable();
+        JsonInsert jsonInsert = new JsonInsert();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, Object> values = new HashMap<>();
+        values.put("uuid", "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6");
+        values.put("emp_name", "testname");
+        values.put("emp_salary", 500);
+        consistencyInfo.put("type", "critical");
+        jsonInsert.setConsistencyInfo(consistencyInfo);
+        jsonInsert.setKeyspaceName(keyspaceName);
+        jsonInsert.setTableName(tableName);
+        jsonInsert.setValues(values);
+        Response response = data.insertIntoTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
+                appName, authorization, jsonInsert, keyspaceName, tableName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
+	
+	@Test
+    public void test4_insertIntoTableNoName() throws Exception {
+        System.out.println("Testing insert into table w/o table name");
+        createTable();
+        JsonInsert jsonInsert = new JsonInsert();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, Object> values = new HashMap<>();
+        values.put("uuid", "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6");
+        values.put("emp_name", "testname");
+        values.put("emp_salary", 500);
+        consistencyInfo.put("type", "eventual");
+        jsonInsert.setConsistencyInfo(consistencyInfo);
+        jsonInsert.setKeyspaceName(keyspaceName);
+        jsonInsert.setTableName(tableName);
+        jsonInsert.setValues(values);
+        Response response = data.insertIntoTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
+                appName, authorization, jsonInsert, "", "");
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
 
 	@Test
 	public void test4_insertIntoTable2() throws Exception {
@@ -582,7 +683,31 @@ public class TstRestMusicDataAPI {
 		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
 		
 		assertEquals(200, response.getStatus());
-	} 
+	}
+	
+	@Test
+    public void test5_updateTableNoName() throws Exception {
+        System.out.println("Testing update table without tablename");
+        createTable();
+        
+        JsonUpdate jsonUpdate = new JsonUpdate();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+        Map<String, Object> values = new HashMap<>();
+        row.add("emp_name", "testname");
+        values.put("emp_salary", 2500);
+        consistencyInfo.put("type", "atomic");
+        jsonUpdate.setConsistencyInfo(consistencyInfo);
+        jsonUpdate.setKeyspaceName(keyspaceName);
+        jsonUpdate.setTableName(tableName);
+        jsonUpdate.setValues(values);
+        Response response = data.updateTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonUpdate, "", "", info);
+        
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        
+        assertEquals(400, response.getStatus());
+    }
 
 	// need mock code to create error for MusicCore methods
 	@Test
diff --git a/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java b/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java
index 75bfa0f2..7e45e160 100644
--- a/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java
+++ b/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java
@@ -39,6 +39,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.music.datastore.MusicDataStoreHandle;
 import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.datastore.jsonobjects.JsonInsert;
+import org.onap.music.datastore.jsonobjects.JsonLeasedLock;
 import org.onap.music.datastore.jsonobjects.JsonTable;
 import org.onap.music.exceptions.MusicServiceException;
 import org.onap.music.lockingservice.cassandra.CassaLockStore;
@@ -124,8 +125,22 @@ public class TstRestMusicLockAPI {
     }
     
     @Test
+    public void test_accquireLockWLease() throws Exception {
+        System.out.println("Testing acquire lock with lease");
+        createAndInsertIntoTable();
+        String lockRef = createLockReference();
+
+        JsonLeasedLock jsonLock = new JsonLeasedLock();
+        jsonLock.setLeasePeriod(10000); //10 second lease period?
+        Response response = lock.accquireLockWithLease(jsonLock, lockRef, "1", "1", authorization,
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+    }
+    
+    @Test
     public void test_accquireBadLock() throws Exception {
-    	System.out.println("Testing acquire lock");
+    	System.out.println("Testing acquire lock that is not lock-holder");
 		createAndInsertIntoTable();
 
     	String lockRef1 = createLockReference();
@@ -140,7 +155,7 @@ public class TstRestMusicLockAPI {
     
     @Test
     public void test_currentLockHolder() throws Exception {
-    	System.out.println("Testing acquire lock");
+    	System.out.println("Testing get current lock holder");
 		createAndInsertIntoTable();
 
     	String lockRef = createLockReference();
@@ -155,7 +170,7 @@ public class TstRestMusicLockAPI {
     
     @Test
     public void test_unLock() throws Exception {
-    	System.out.println("Testing acquire lock");
+    	System.out.println("Testing unlock");
 		createAndInsertIntoTable();
     	String lockRef = createLockReference();
 
@@ -164,6 +179,34 @@ public class TstRestMusicLockAPI {
     	System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
     	assertEquals(200, response.getStatus());
     }
+    
+    @Test
+    public void test_getLockState() throws Exception {
+        System.out.println("Testing get lock state");
+        createAndInsertIntoTable();
+
+        String lockRef = createLockReference();
+
+        Response response = lock.currentLockState(lockName, "1", "1", authorization,
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+        Map<String,Object> respMap = (Map<String, Object>) response.getEntity();
+        assertEquals(lockRef, ((Map<String,String>) respMap.get("lock")).get("lock-holder"));
+    }
+    
+    @Test
+    public void test_deleteLock() throws Exception {
+        System.out.println("Testing get lock state");
+        createAndInsertIntoTable();
+
+        String lockRef = createLockReference();
+
+        Response response = lock.deleteLock(lockName, "1", "1",
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", authorization, appName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+    }
 	
 	/**
 	 * Create table and lock reference