Caching util test cases

And cleaning up of other tests

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

6 files changed, 1244 insertions, 1255 deletions

diff --git a/src/test/java/org/onap/music/unittests/TestAPISuite.java b/src/test/java/org/onap/music/unittests/TestsUsingCassandra.java
index 65c8de6a..35f3b326 100644
--- a/src/test/java/org/onap/music/unittests/TestAPISuite.java
+++ b/src/test/java/org/onap/music/unittests/TestsUsingCassandra.java
@@ -44,8 +44,9 @@ import com.sun.jersey.core.util.Base64;
 
 @RunWith(Suite.class)
 @SuiteClasses({ TstRestMusicDataAPI.class, TstRestMusicLockAPI.class, TstRestMusicAdminAPI.class,
-    TstRestMusicConditionalAPI.class})
-public class TestAPISuite {
+    TstRestMusicConditionalAPI.class, TstCachingUtil.class})
+//@SuiteClasses({TstCachingUtil.class})
+public class TestsUsingCassandra {
 
 	static String appName = "TestApp";
 	static String userId = "TestUser";
diff --git a/src/test/java/org/onap/music/unittests/TstCachingUtil.java b/src/test/java/org/onap/music/unittests/TstCachingUtil.java
new file mode 100644
index 00000000..be2783b2
--- /dev/null
+++ b/src/test/java/org/onap/music/unittests/TstCachingUtil.java
@@ -0,0 +1,141 @@
+/*
+ * ============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 static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import java.util.UUID;
+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.junit.MockitoJUnitRunner;
+import org.onap.music.datastore.PreparedQueryObject;
+import org.onap.music.main.CachingUtil;
+import org.onap.music.main.MusicCore;
+import org.onap.music.main.MusicUtil;
+import org.onap.music.rest.RestMusicDataAPI;
+import com.datastax.driver.core.DataType;
+import com.sun.jersey.core.util.Base64;
+
+public class TstCachingUtil {
+
+    static PreparedQueryObject testObject;
+
+    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 CachingUtil class");
+        try {
+            createKeyspace();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new Exception("Unable to initialize before CachingUtil test class. " + e.getMessage());
+        }
+    }
+
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+        testObject = new PreparedQueryObject();
+        testObject.appendQueryString("DROP KEYSPACE IF EXISTS " + keyspaceName);
+        MusicCore.eventualPut(testObject);
+    }
+
+    @Test
+    public void test_isAAF_False() throws Exception {
+        System.out.println("Testing isAAF, nonaaf app");
+        assertEquals("false", CachingUtil.isAAFApplication(appName));
+    }
+
+    @Test
+    public void test_getUUidFromMusicCache() throws Exception {
+        System.out.println("Testing getUUID from MusicCache");
+        assertEquals(uuid.toString(), CachingUtil.getUuidFromMusicCache(keyspaceName));
+    }
+
+    @Test
+    public void test_getAppName() throws Exception {
+        System.out.println("Testing getAppName");
+        assertEquals(appName, CachingUtil.getAppName(keyspaceName));
+    }
+
+    @Test
+    public void test_verifyOnboarding() throws Exception {
+        System.out.println("Testing verifyOnboarding");
+        assertTrue(CachingUtil.verifyOnboarding(appName, userId, password).isEmpty());
+    }
+
+    @Test
+    public void test_verifyOnboardingFailure() throws Exception {
+        System.out.println("Testing verifyOnboarding with bad password");
+        assertFalse(CachingUtil.verifyOnboarding(appName, userId, "pass").isEmpty());
+    }
+
+
+    @Test
+    public void test_authenticateAIDUser() throws Exception {
+        System.out.println("Testing authenticateAIDUser");
+        assertTrue(CachingUtil.authenticateAIDUser(appName, userId, password, keyspaceName).isEmpty());
+    }
+
+    @Test
+    public void test_authenticateAIDUserFailure() throws Exception {
+        System.out.println("Testing authenticateAIDUser bad password");
+        assertFalse(CachingUtil.authenticateAIDUser(appName, userId, "pass", keyspaceName).isEmpty());
+    }
+
+    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);
+    }
+
+}
diff --git a/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java b/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java
index b00c4fcc..93d8fcb9 100644
--- a/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java
+++ b/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java
@@ -109,8 +109,7 @@ public class TstRestMusicAdminAPI {
 		System.out.println("Testing RestMusicAdmin class");
 		//PowerMockito.mockStatic(MusicAuthentication.class);
     	try {
-    		MusicDataStoreHandle.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra();
-			createAdminTable();
+    		//MusicDataStoreHandle.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra();
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new Exception("Unable to initialize before TestRestMusicData test class. " + e.getMessage());
@@ -326,39 +325,5 @@ public class TstRestMusicAdminAPI {
         Map<String, Object> resultMap = (Map<String, Object>) admin.deleteOnboardApp(jsonOnboard,adminAuthorization).getEntity();
         assertNotNull(resultMap);
     }
-    
-    
-    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"));
-		}
-	}
    
 }
\ 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
index 1f0e24c2..e253d185 100644
--- a/src/test/java/org/onap/music/unittests/TstRestMusicConditionalAPI.java
+++ b/src/test/java/org/onap/music/unittests/TstRestMusicConditionalAPI.java
@@ -1,16 +1,15 @@
 /*
  * ============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
+ * =================================================================== 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.
+ * 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=============================================
  * ====================================================================
@@ -66,58 +65,58 @@ import com.sun.jersey.core.util.MultivaluedMapImpl;
 public class TstRestMusicConditionalAPI {
 
     RestMusicDataAPI data = new RestMusicDataAPI();
-	RestMusicConditionalAPI cond = new RestMusicConditionalAPI();
-	static PreparedQueryObject testObject;
+    RestMusicConditionalAPI cond = new RestMusicConditionalAPI();
+    static PreparedQueryObject testObject;
 
-	@Mock
-	HttpServletResponse http;
+    @Mock
+    HttpServletResponse http;
 
-	@Mock
-	UriInfo info;
+    @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;
+    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();
-	}
+    @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());
+        }
+    }
 
-	@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();
+    @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");
@@ -135,7 +134,7 @@ public class TstRestMusicConditionalAPI {
         nonexists.put("status", "underway");
         condition.put("exists", exists);
         condition.put("nonexists", nonexists);
-        
+
         jsonCond.setPrimaryKey("id");
         jsonCond.setPrimaryKeyValue("testname");
         jsonCond.setCasscadeColumnName("plans");
@@ -143,94 +142,62 @@ public class TstRestMusicConditionalAPI {
         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());
+        Response response = cond.insertConditional("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, keyspaceName, tableName, jsonCond);
 
-		assertEquals(401, response.getStatus());
-	}
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
 
-	// 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(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()); }
+     */
 
-		assertEquals(400, response.getStatus());
-	}
-*/
+    @Test
+    public void test5_updateTable() throws Exception {
+        System.out.println("Testing conditional update table");
+        createAndInsertIntoTable();
 
-	@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");
@@ -240,154 +207,85 @@ public class TstRestMusicConditionalAPI {
         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());
-	}
+        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());
 
-	@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);
+        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()); }
+     * 
+     */
 
-		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);
 
-	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;
+        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.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));
@@ -398,52 +296,54 @@ public class TstRestMusicConditionalAPI {
         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();
-		
+    }
+
+    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();
@@ -462,7 +362,7 @@ public class TstRestMusicConditionalAPI {
         nonexists.put("status", "underway");
         condition.put("exists", exists);
         condition.put("nonexists", nonexists);
-        
+
         jsonCond.setPrimaryKey("id");
         jsonCond.setPrimaryKeyValue("test_id");
         jsonCond.setCasscadeColumnName("plans");
@@ -470,7 +370,7 @@ public class TstRestMusicConditionalAPI {
         jsonCond.setCasscadeColumnData(cascadeData);
         jsonCond.setConditions(condition);
 
-        Response response = cond.insertConditional("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
-                appName, authorization, keyspaceName, tableName, jsonCond);
-	}
+        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 0f0545e8..a4ea84f0 100644
--- a/src/test/java/org/onap/music/unittests/TstRestMusicDataAPI.java
+++ b/src/test/java/org/onap/music/unittests/TstRestMusicDataAPI.java
@@ -1,16 +1,15 @@
 /*
  * ============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
+ * =================================================================== 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.
+ * 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=============================================
  * ====================================================================
@@ -63,97 +62,97 @@ import com.sun.jersey.core.util.MultivaluedMapImpl;
 @RunWith(MockitoJUnitRunner.class)
 public class TstRestMusicDataAPI {
 
-	RestMusicDataAPI data = new RestMusicDataAPI();
-	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 RestMusicData 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 test1_createKeyspace() throws Exception {
-		System.out.println("Testing create keyspace");
-		JsonKeySpace jsonKeyspace = new JsonKeySpace();
-		Map<String, String> consistencyInfo = new HashMap<>();
-		Map<String, Object> replicationInfo = new HashMap<>();
-		consistencyInfo.put("type", "eventual");
-		replicationInfo.put("class", "SimpleStrategy");
-		replicationInfo.put("replication_factor", 1);
-		jsonKeyspace.setConsistencyInfo(consistencyInfo);
-		jsonKeyspace.setDurabilityOfWrites("true");
-		jsonKeyspace.setKeyspaceName(keyspaceName);
-		jsonKeyspace.setReplicationInfo(replicationInfo);
-		//Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-		Response response = data.createKeySpace("1", "1", "1", null,authorization, appName,  jsonKeyspace, keyspaceName);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-		assertEquals(400,response.getStatus());
-		Map<String,String> respMap = (Map<String, String>) response.getEntity();
-		assertEquals(ResultType.FAILURE, respMap.get("status"));
-	}
-
-	@Test
-	public void test3_createTable() throws Exception {
-		System.out.println("Testing create table");
-		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(tableName);
-		jsonTable.setFields(fields);
-		Response response = data.createTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6",appName, authorization, 
-				jsonTable, keyspaceName, tableName);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-		assertEquals(200, response.getStatus());
-	}
-	
-	@Test
+    RestMusicDataAPI data = new RestMusicDataAPI();
+    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 RestMusicData 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 test1_createKeyspace() throws Exception {
+        System.out.println("Testing create keyspace");
+        JsonKeySpace jsonKeyspace = new JsonKeySpace();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, Object> replicationInfo = new HashMap<>();
+        consistencyInfo.put("type", "eventual");
+        replicationInfo.put("class", "SimpleStrategy");
+        replicationInfo.put("replication_factor", 1);
+        jsonKeyspace.setConsistencyInfo(consistencyInfo);
+        jsonKeyspace.setDurabilityOfWrites("true");
+        jsonKeyspace.setKeyspaceName(keyspaceName);
+        jsonKeyspace.setReplicationInfo(replicationInfo);
+        // Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
+        Response response =
+                data.createKeySpace("1", "1", "1", null, authorization, appName, jsonKeyspace, keyspaceName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(400, response.getStatus());
+        Map<String, String> respMap = (Map<String, String>) response.getEntity();
+        assertEquals(ResultType.FAILURE, respMap.get("status"));
+    }
+
+    @Test
+    public void test3_createTable() throws Exception {
+        System.out.println("Testing create table");
+        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(tableName);
+        jsonTable.setFields(fields);
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, keyspaceName, tableName);
+        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();
@@ -169,330 +168,338 @@ public class TstRestMusicDataAPI {
         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, "");
+        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
+    public void test3_createTableClusterOrderBad() throws Exception {
+        System.out.println("Testing create table bad clustering");
+        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.setPrimaryKey("emp_name,emp_salary");
+        jsonTable.setClusteringOrder("ASC");
+        jsonTable.setTableName(tableName);
+        jsonTable.setFields(fields);
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, keyspaceName, tableName);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
         assertEquals(400, response.getStatus());
     }
 
+    @Test
+    public void test3_createTable_withPropertiesNotNull() throws Exception {
+        System.out.println("Testing create table with properties");
+        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");
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("comment", "Testing prperties not null");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        jsonTable.setKeyspaceName(keyspaceName);
+        jsonTable.setPrimaryKey("emp_name");
+        String tableName_prop = tableName + "_Prop";
+        jsonTable.setTableName(tableName_prop);
+        jsonTable.setFields(fields);
+        jsonTable.setProperties(properties);
+
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, keyspaceName, tableName_prop);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+    }
 
-	@Test
-	public void test3_createTableClusterOrderBad() throws Exception {
-		System.out.println("Testing create table bad clustering");
-		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.setPrimaryKey("emp_name,emp_salary");
-		jsonTable.setClusteringOrder("ASC");
-		jsonTable.setTableName(tableName);
-		jsonTable.setFields(fields);
-		Response response = data.createTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6",appName, authorization, 
-				jsonTable, keyspaceName, tableName);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-		assertEquals(400, response.getStatus());
-	}
-
-	@Test
-	public void test3_createTable_withPropertiesNotNull() throws Exception {
-		System.out.println("Testing create table with properties");
-		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");
-		Map<String, Object> properties = new HashMap<>();
-		properties.put("comment","Testing prperties not null");
-		jsonTable.setConsistencyInfo(consistencyInfo);
-		jsonTable.setKeyspaceName(keyspaceName);
-		jsonTable.setPrimaryKey("emp_name");
-		String tableName_prop=tableName+"_Prop";
-		jsonTable.setTableName(tableName_prop);
-		jsonTable.setFields(fields);
-		jsonTable.setProperties(properties);
-
-		Response response = data.createTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6",appName, authorization, 
-				jsonTable, keyspaceName, tableName_prop);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-		assertEquals(200, response.getStatus());
-	}
-
-	@Test
-	public void test3_createTable_duplicateTable() throws Exception {
-		System.out.println("Testing creating duplicate tables");
-		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");
-		String tableNameDup=tableName+"x";
-		jsonTable.setTableName(tableNameDup);
-		jsonTable.setFields(fields);
-		//Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-		Response response1 = data.createTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-				jsonTable, keyspaceName, tableNameDup);
-
-		Response response2 = data.createTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-				jsonTable, keyspaceName, tableNameDup);
-		System.out.println("Status: " + response2.getStatus() + ". Entity " + response2.getEntity());
-
-		assertEquals(400, response2.getStatus());
-		Map<String,String> respMap = (Map<String, String>) response2.getEntity();
-		assertEquals(ResultType.FAILURE, respMap.get("status"));
-		assertEquals("Table " + keyspaceName + "." + tableNameDup + " already exists",
-				respMap.get("error"));
-	}
-
-	// Improper Auth
-	@Test
-	public void test3_createTable1() throws Exception {
-		System.out.println("Testing create table w/ improper authentication");
-		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(tableName);
-		jsonTable.setFields(fields);
-		Response response = data.createTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, wrongAuthorization,
-				jsonTable, keyspaceName, tableName);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-		assertEquals(401, response.getStatus());
-	}
-
-	// Improper keyspace
-	@Test
-	public void test3_createTable3() throws Exception {
-		System.out.println("Testing create table for wrong keyspace");
-		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(tableName);
-		jsonTable.setFields(fields);
-		Response response = data.createTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-				jsonTable, "wrong", tableName);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-		assertEquals(401, response.getStatus());
-	}
-
-	// Improper parenthesis in key field
-	@Test
-	public void test3_createTable_badParantesis() throws Exception {
-		System.out.println("Testing malformed create table request");
-		String tableNameC ="testTable0";
-		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_id)");
-		fields.put("emp_id", "varint");
-		consistencyInfo.put("type", "eventual");
-		jsonTable.setConsistencyInfo(consistencyInfo);
-		jsonTable.setKeyspaceName(keyspaceName);
-		jsonTable.setPrimaryKey("emp_name");
-		jsonTable.setTableName(tableNameC);
-		jsonTable.setClusteringOrder("emp_id Desc");
-		jsonTable.setFields(fields);
-		Response response = data.createTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-				jsonTable, keyspaceName, tableNameC);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-		assertEquals(400, response.getStatus());
-	}
-
-
-	// good clustering key
-	@Test
-	public void test3_createTable_1_clusterKey_good() throws Exception {
-		System.out.println("Testing create w/ clusterKey");
-
-		String tableNameC ="testTableC1";
-		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.setPrimaryKey("emp_name");
-		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);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-		assertEquals(200, response.getStatus());
-	}
-
-	// bad partition key=clustering key
-	@Test
-	public void test3_createTable_2_clusterKey_bad() throws Exception {
-		System.out.println("Testing create w/ bad clusterKey");
-		String tableNameC ="testTableC2";
-		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_name)");
-		consistencyInfo.put("type", "eventual");
-		jsonTable.setConsistencyInfo(consistencyInfo);
-		jsonTable.setKeyspaceName(keyspaceName);
-		jsonTable.setPrimaryKey("emp_name");  // "PRIMARY KEY" overrides if primaryKey present
-		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);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-		assertEquals(400, response.getStatus());
-	}
-
-	// good composite partition key,clustering key
-	@Test
-	public void test3_createTable_3_pfartition_clusterKey_good() throws Exception {
-		System.out.println("Testing create w/ composite partition key, clusterKey");
-
-		String tableNameC ="testTableC3";
-		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_id", "varint");
-		fields.put("emp_salary", "varint");
-		fields.put("PRIMARY KEY", "((emp_name,emp_id),emp_salary)");
-		consistencyInfo.put("type", "eventual");
-		jsonTable.setConsistencyInfo(consistencyInfo);
-		jsonTable.setKeyspaceName(keyspaceName);
-		jsonTable.setPrimaryKey("emp_name");
-		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);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-		assertEquals(200, response.getStatus());
-	}
-
-	// bad - wrong cols in order by of composite partition key,clustering key
-	@Test
-	public void test3_createTable_5_clusteringOrder_bad() throws Exception {
-		System.out.println("Testing create table bad request with clustering & composite keys");
-		String tableNameC ="testTableC5";
-		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_id", "varint");
-		fields.put("emp_salary", "varint");
-		fields.put("PRIMARY KEY", "((uuid,emp_name),emp_id,emp_salary)");
-		consistencyInfo.put("type", "eventual");
-		jsonTable.setConsistencyInfo(consistencyInfo);
-		jsonTable.setKeyspaceName(keyspaceName);
-		jsonTable.setPrimaryKey("emp_name");
-		jsonTable.setTableName(tableNameC);
-		jsonTable.setClusteringOrder("emp_idx desc, emp_salary ASC");
-		jsonTable.setFields(fields);
-		Response response = data.createTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-				jsonTable, keyspaceName, tableNameC);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-		assertEquals(400, response.getStatus());
-	}
-
-
-	// good clustering key, need to pass queryparameter
-	@Test
-	public void test3_createTableIndex_1() throws Exception {
-		System.out.println("Testing index in create table");
-		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");
-		Mockito.when(info.getQueryParameters()).thenReturn(new MultivaluedHashMap<String, String>(queryParametersMap));
-		response = data.createIndex("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-				keyspaceName, tableNameC,"uuid",info);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-		assertEquals(200, response.getStatus());
-	}
-	
-	// create index without table name
+    @Test
+    public void test3_createTable_duplicateTable() throws Exception {
+        System.out.println("Testing creating duplicate tables");
+        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");
+        String tableNameDup = tableName + "x";
+        jsonTable.setTableName(tableNameDup);
+        jsonTable.setFields(fields);
+        // Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
+        Response response1 = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, keyspaceName, tableNameDup);
+
+        Response response2 = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, keyspaceName, tableNameDup);
+        System.out.println("Status: " + response2.getStatus() + ". Entity " + response2.getEntity());
+
+        assertEquals(400, response2.getStatus());
+        Map<String, String> respMap = (Map<String, String>) response2.getEntity();
+        assertEquals(ResultType.FAILURE, respMap.get("status"));
+        assertEquals("Table " + keyspaceName + "." + tableNameDup + " already exists", respMap.get("error"));
+    }
+
+    // Improper Auth
+    @Test
+    public void test3_createTable1() throws Exception {
+        System.out.println("Testing create table w/ improper authentication");
+        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(tableName);
+        jsonTable.setFields(fields);
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                wrongAuthorization, jsonTable, keyspaceName, tableName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(401, response.getStatus());
+    }
+
+    // Improper keyspace
+    @Test
+    public void test3_createTable3() throws Exception {
+        System.out.println("Testing create table for wrong keyspace");
+        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(tableName);
+        jsonTable.setFields(fields);
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, "wrong", tableName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(401, response.getStatus());
+    }
+
+    // Improper parenthesis in key field
+    @Test
+    public void test3_createTable_badParantesis() throws Exception {
+        System.out.println("Testing malformed create table request");
+        String tableNameC = "testTable0";
+        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_id)");
+        fields.put("emp_id", "varint");
+        consistencyInfo.put("type", "eventual");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        jsonTable.setKeyspaceName(keyspaceName);
+        jsonTable.setPrimaryKey("emp_name");
+        jsonTable.setTableName(tableNameC);
+        jsonTable.setClusteringOrder("emp_id Desc");
+        jsonTable.setFields(fields);
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, keyspaceName, tableNameC);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
+
+
+    // good clustering key
+    @Test
+    public void test3_createTable_1_clusterKey_good() throws Exception {
+        System.out.println("Testing create w/ clusterKey");
+
+        String tableNameC = "testTableC1";
+        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.setPrimaryKey("emp_name");
+        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);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(200, response.getStatus());
+    }
+
+    // bad partition key=clustering key
+    @Test
+    public void test3_createTable_2_clusterKey_bad() throws Exception {
+        System.out.println("Testing create w/ bad clusterKey");
+        String tableNameC = "testTableC2";
+        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_name)");
+        consistencyInfo.put("type", "eventual");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        jsonTable.setKeyspaceName(keyspaceName);
+        jsonTable.setPrimaryKey("emp_name"); // "PRIMARY KEY" overrides if primaryKey present
+        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);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
+
+    // good composite partition key,clustering key
+    @Test
+    public void test3_createTable_3_pfartition_clusterKey_good() throws Exception {
+        System.out.println("Testing create w/ composite partition key, clusterKey");
+
+        String tableNameC = "testTableC3";
+        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_id", "varint");
+        fields.put("emp_salary", "varint");
+        fields.put("PRIMARY KEY", "((emp_name,emp_id),emp_salary)");
+        consistencyInfo.put("type", "eventual");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        jsonTable.setKeyspaceName(keyspaceName);
+        jsonTable.setPrimaryKey("emp_name");
+        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);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(200, response.getStatus());
+    }
+
+    // bad - wrong cols in order by of composite partition key,clustering key
+    @Test
+    public void test3_createTable_5_clusteringOrder_bad() throws Exception {
+        System.out.println("Testing create table bad request with clustering & composite keys");
+        String tableNameC = "testTableC5";
+        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_id", "varint");
+        fields.put("emp_salary", "varint");
+        fields.put("PRIMARY KEY", "((uuid,emp_name),emp_id,emp_salary)");
+        consistencyInfo.put("type", "eventual");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        jsonTable.setKeyspaceName(keyspaceName);
+        jsonTable.setPrimaryKey("emp_name");
+        jsonTable.setTableName(tableNameC);
+        jsonTable.setClusteringOrder("emp_idx desc, emp_salary ASC");
+        jsonTable.setFields(fields);
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, keyspaceName, tableNameC);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
+
+    @Ignore
+    @Test
+    public void test3_createTablePartitionKey() throws Exception {
+        System.out.println("Testing create table with a partitionKey");
+        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(tableName);
+        jsonTable.setFields(fields);
+        jsonTable.setPartitionKey("emp_salary");
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, keyspaceName, tableName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+    }
+
+    // good clustering key, need to pass queryparameter
+    @Test
+    public void test3_createTableIndex_1() throws Exception {
+        System.out.println("Testing index in create table");
+        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");
+        Mockito.when(info.getQueryParameters()).thenReturn(new MultivaluedHashMap<String, String>(queryParametersMap));
+        response = data.createIndex("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
+                keyspaceName, tableNameC, "uuid", info);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        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";
+        String tableNameC = "testTableCinx";
         JsonTable jsonTable = new JsonTable();
         Map<String, String> consistencyInfo = new HashMap<>();
         Map<String, String> fields = new HashMap<>();
@@ -506,45 +513,43 @@ public class TstRestMusicDataAPI {
         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);
+        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>();
+        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);
+        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 {
-		System.out.println("Testing insert into 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", "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, keyspaceName, tableName);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-		assertEquals(200, response.getStatus());
-	}
-	
-	@Test
+    @Test
+    public void test4_insertIntoTable() throws Exception {
+        System.out.println("Testing insert into 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", "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, keyspaceName, tableName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(200, response.getStatus());
+    }
+
+    @Test
     public void test4_insertIntoTableCriticalNoLockID() throws Exception {
         System.out.println("Testing atomic insert into table without lockid");
         createTable();
@@ -559,14 +564,14 @@ public class TstRestMusicDataAPI {
         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);
+        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
+
+    @Test
     public void test4_insertIntoTableNoName() throws Exception {
         System.out.println("Testing insert into table w/o table name");
         createTable();
@@ -581,115 +586,134 @@ public class TstRestMusicDataAPI {
         jsonInsert.setKeyspaceName(keyspaceName);
         jsonInsert.setTableName(tableName);
         jsonInsert.setValues(values);
-        Response response = data.insertIntoTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
-                appName, authorization, jsonInsert, "", "");
+        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 {
-		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 update table");
-		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);
-		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());
-	}
-	
-	@Test
+    @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 test4_insertBlobIntoTable() throws Exception {
+        System.out.println("Testing insert a blob into 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", "testname");
+        values.put("emp_salary", 500);
+        values.put("binary", "somestuffhere");
+        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());
+    }
+
+    @Test
+    public void test5_updateTable() throws Exception {
+        System.out.println("Testing update table");
+        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);
+        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());
+    }
+
+    @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();
@@ -703,284 +727,245 @@ public class TstRestMusicDataAPI {
         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
+    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());
+    }
+
+
+    @Test
+    public void test6_select() throws Exception {
+        System.out.println("Testing select");
+        createAndInsertIntoTable();
+        JsonSelect jsonSelect = new JsonSelect();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+        row.add("emp_name", "testname");
+        consistencyInfo.put("type", "atomic");
+        jsonSelect.setConsistencyInfo(consistencyInfo);
+        Mockito.when(info.getQueryParameters()).thenReturn(row);
+        Response response = data.select("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
+                keyspaceName, tableName, info);
+        HashMap<String, HashMap<String, Object>> map = (HashMap<String, HashMap<String, Object>>) response.getEntity();
+        HashMap<String, Object> result = map.get("result");
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        Map<String, String> row0 = (Map<String, String>) result.get("row 0");
+        assertEquals("testname", row0.get("emp_name"));
+        assertEquals(BigInteger.valueOf(500), row0.get("emp_salary"));
+    }
+
+    @Test
+    public void test6_selectCritical() throws Exception {
+        System.out.println("Testing select critical");
+        createAndInsertIntoTable();
+        JsonInsert jsonInsert = new JsonInsert();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+        row.add("emp_name", "testname");
+        consistencyInfo.put("type", "atomic");
+        jsonInsert.setConsistencyInfo(consistencyInfo);
+        Mockito.when(info.getQueryParameters()).thenReturn(row);
+        Response response = data.selectCritical("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonInsert, keyspaceName, tableName, info);
+        HashMap<String, HashMap<String, Object>> map = (HashMap<String, HashMap<String, Object>>) response.getEntity();
+        HashMap<String, Object> result = map.get("result");
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        Map<String, String> row0 = (Map<String, String>) result.get("row 0");
+        assertEquals("testname", row0.get("emp_name"));
+        assertEquals(BigInteger.valueOf(500), row0.get("emp_salary"));
+    }
+
+    @Test
+    public void test6_deleteFromTable() throws Exception {
+        System.out.println("Testing delete from table");
+        createAndInsertIntoTable();
+        JsonDelete jsonDelete = new JsonDelete();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+        row.add("emp_name", "test1");
+        consistencyInfo.put("type", "atomic");
+        jsonDelete.setConsistencyInfo(consistencyInfo);
+        Mockito.when(info.getQueryParameters()).thenReturn(row);
+        Response response = data.deleteFromTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonDelete, keyspaceName, tableName, info);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(200, response.getStatus());
+    }
+
+    // Values
+    @Ignore
+    @Test
+    public void test6_deleteFromTable1() throws Exception {
+        System.out.println("Testing delete from table missing delete object");
+        createAndInsertIntoTable();
+
+        JsonDelete jsonDelete = new JsonDelete();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+        consistencyInfo.put("type", "atomic");
+        jsonDelete.setConsistencyInfo(consistencyInfo);
+        // Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
+        Mockito.when(info.getQueryParameters()).thenReturn(row);
+        Response response = data.deleteFromTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonDelete, keyspaceName, tableName, info);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
+
+    // delObj
+    @Test
+    public void test6_deleteFromTable2() throws Exception {
+        System.out.println("Testing delete from table missing delete object");
+        createAndInsertIntoTable();
+        JsonDelete jsonDelete = new JsonDelete();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "atomic");
+        jsonDelete.setConsistencyInfo(consistencyInfo);
+        Response response = data.deleteFromTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, null, keyspaceName, tableName, info);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
+
+    @Test
+    public void test7_dropTable() throws Exception {
+        System.out.println("Testing drop table");
+        createTable();
+        JsonTable jsonTable = new JsonTable();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "atomic");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        Response response = data.dropTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, keyspaceName, tableName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(200, response.getStatus());
+    }
+
+
+    @Test
+    public void test8_deleteKeyspace() throws Exception {
+        System.out.println("Testing drop keyspace");
+
+        JsonKeySpace jsonKeyspace = new JsonKeySpace();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, Object> replicationInfo = new HashMap<>();
+        consistencyInfo.put("type", "eventual");
+        replicationInfo.put("class", "SimpleStrategy");
+        replicationInfo.put("replication_factor", 1);
+        jsonKeyspace.setConsistencyInfo(consistencyInfo);
+        jsonKeyspace.setDurabilityOfWrites("true");
+        jsonKeyspace.setKeyspaceName("TestApp1");
+        jsonKeyspace.setReplicationInfo(replicationInfo);
+        Response response = data.dropKeySpace("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", authorization,
+                appName, keyspaceName);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        
+
         assertEquals(400, 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());
-	}
-
-
-	@Test
-	public void test6_select() throws Exception {
-		System.out.println("Testing select");
-		createAndInsertIntoTable();
-		JsonSelect jsonSelect = new JsonSelect();
-		Map<String, String> consistencyInfo = new HashMap<>();
-		MultivaluedMap<String, String> row = new MultivaluedMapImpl();
-		row.add("emp_name", "testname");
-		consistencyInfo.put("type", "atomic");
-		jsonSelect.setConsistencyInfo(consistencyInfo);
-		Mockito.when(info.getQueryParameters()).thenReturn(row);
-		Response response = data.select("1", "1", "1","abc66ccc-d857-4e90-b1e5-df98a3d40ce6", 
-				appName, authorization, keyspaceName, tableName, info);
-		HashMap<String,HashMap<String,Object>> map = (HashMap<String, HashMap<String, Object>>) response.getEntity();
-		HashMap<String, Object> result = map.get("result");
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-		
-		Map<String, String> row0 = (Map<String, String>) result.get("row 0");
-		assertEquals("testname", row0.get("emp_name"));
-		assertEquals(BigInteger.valueOf(500), row0.get("emp_salary"));
-	}
-
-	@Test
-	public void test6_selectCritical() throws Exception {
-		System.out.println("Testing select critical");
-		createAndInsertIntoTable();
-		JsonInsert jsonInsert = new JsonInsert();
-		Map<String, String> consistencyInfo = new HashMap<>();
-		MultivaluedMap<String, String> row = new MultivaluedMapImpl();
-		row.add("emp_name", "testname");
-		consistencyInfo.put("type", "atomic");
-		jsonInsert.setConsistencyInfo(consistencyInfo);
-		Mockito.when(info.getQueryParameters()).thenReturn(row);
-		Response response = data.selectCritical("1", "1", "1","abc66ccc-d857-4e90-b1e5-df98a3d40ce6", 
-				appName, authorization, jsonInsert, keyspaceName, tableName,info);
-		HashMap<String,HashMap<String,Object>> map = (HashMap<String, HashMap<String, Object>>) response.getEntity();
-		HashMap<String, Object> result = map.get("result");
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-		
-		Map<String, String> row0 = (Map<String, String>) result.get("row 0");
-		assertEquals("testname", row0.get("emp_name"));
-		assertEquals(BigInteger.valueOf(500), row0.get("emp_salary"));
-	}
-
-	@Test
-	public void test6_deleteFromTable() throws Exception {
-		System.out.println("Testing delete from table");
-		createAndInsertIntoTable();
-		JsonDelete jsonDelete = new JsonDelete();
-		Map<String, String> consistencyInfo = new HashMap<>();
-		MultivaluedMap<String, String> row = new MultivaluedMapImpl();
-		row.add("emp_name", "test1");
-		consistencyInfo.put("type", "atomic");
-		jsonDelete.setConsistencyInfo(consistencyInfo);
-		Mockito.when(info.getQueryParameters()).thenReturn(row);
-		Response response = data.deleteFromTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-				jsonDelete, keyspaceName, tableName, info);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-		assertEquals(200, response.getStatus());
-	}
-
-	// Values
-	@Ignore
-	@Test
-	public void test6_deleteFromTable1() throws Exception {
-		System.out.println("Testing delete from table missing delete object");
-		createAndInsertIntoTable();
-		
-		JsonDelete jsonDelete = new JsonDelete();
-		Map<String, String> consistencyInfo = new HashMap<>();
-		MultivaluedMap<String, String> row = new MultivaluedMapImpl();
-		consistencyInfo.put("type", "atomic");
-		jsonDelete.setConsistencyInfo(consistencyInfo);
-		//Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-		Mockito.when(info.getQueryParameters()).thenReturn(row);
-		Response response = data.deleteFromTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-				jsonDelete, keyspaceName, tableName, info);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-		assertEquals(400, response.getStatus());
-	}
-
-	// delObj
-	@Test
-	public void test6_deleteFromTable2() throws Exception {
-		System.out.println("Testing delete from table missing delete object");
-		createAndInsertIntoTable();
-		JsonDelete jsonDelete = new JsonDelete();
-		Map<String, String> consistencyInfo = new HashMap<>();
-		consistencyInfo.put("type", "atomic");
-		jsonDelete.setConsistencyInfo(consistencyInfo);
-		Response response = data.deleteFromTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-				null, keyspaceName, tableName, info);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-		
-		assertEquals(400, response.getStatus());
-	}
-
-	@Test
-	public void test7_dropTable() throws Exception {
-		System.out.println("Testing drop table");
-		createTable();
-		JsonTable jsonTable = new JsonTable();
-		Map<String, String> consistencyInfo = new HashMap<>();
-		consistencyInfo.put("type", "atomic");
-		jsonTable.setConsistencyInfo(consistencyInfo);
-		Response response = data.dropTable("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-				keyspaceName, tableName);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-		
-		assertEquals(200, response.getStatus());
-	}
-
-
-	@Test
-	public void test8_deleteKeyspace() throws Exception {
-		System.out.println("Testing drop keyspace");
-
-		JsonKeySpace jsonKeyspace = new JsonKeySpace();
-		Map<String, String> consistencyInfo = new HashMap<>();
-		Map<String, Object> replicationInfo = new HashMap<>();
-		consistencyInfo.put("type", "eventual");
-		replicationInfo.put("class", "SimpleStrategy");
-		replicationInfo.put("replication_factor", 1);
-		jsonKeyspace.setConsistencyInfo(consistencyInfo);
-		jsonKeyspace.setDurabilityOfWrites("true");
-		jsonKeyspace.setKeyspaceName("TestApp1");
-		jsonKeyspace.setReplicationInfo(replicationInfo);
-		Response response = data.dropKeySpace("1", "1", "1",
-				"abc66ccc-d857-4e90-b1e5-df98a3d40ce6", authorization,appName, keyspaceName);
-		System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-		assertEquals(400, 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;
+    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.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));
@@ -991,66 +976,70 @@ public class TstRestMusicDataAPI {
         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("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(tableName);
-		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, tableName);
-	}
-	
-	/**
-	 * Create table {@link createTable} and insert into said table
-	 * @throws Exception
-	 */
-	private void createAndInsertIntoTable() throws Exception {
-		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, keyspaceName, tableName);
-	}
+    }
+
+    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("uuid", "text");
+        fields.put("emp_name", "text");
+        fields.put("emp_salary", "varint");
+        fields.put("binary", "blob");
+        fields.put("PRIMARY KEY", "(emp_name)");
+        consistencyInfo.put("type", "eventual");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        jsonTable.setKeyspaceName(keyspaceName);
+        jsonTable.setPrimaryKey("emp_name");
+        jsonTable.setTableName(tableName);
+        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, tableName);
+    }
+
+    /**
+     * Create table {@link createTable} and insert into said table
+     * 
+     * @throws Exception
+     */
+    private void createAndInsertIntoTable() throws Exception {
+        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);
+        values.put("binary", "binarydatahere");
+        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);
+    }
 }
diff --git a/src/test/java/org/onap/music/unittests/jsonobjects/JsonTableTest.java b/src/test/java/org/onap/music/unittests/jsonobjects/JsonTableTest.java
index 2279cf0b..4e3b4629 100644
--- a/src/test/java/org/onap/music/unittests/jsonobjects/JsonTableTest.java
+++ b/src/test/java/org/onap/music/unittests/jsonobjects/JsonTableTest.java
@@ -78,13 +78,6 @@ public class JsonTableTest {
    }
 
     @Test
-    public void testGetSortingKey() {
-        String sortKey = "sortkey";
-        jt.setSortingKey(sortKey);
-        assertEquals(sortKey,jt.getSortingKey());
-    }
-
-    @Test
     public void testGetClusteringOrder() {
         String clusteringOrder = "clusteringOrder";
         jt.setClusteringOrder(clusteringOrder);