diff --git a/backend-service/build.sbt b/backend-service/build.sbt
index eafceae224..ba08222f5c 100644
--- a/backend-service/build.sbt
+++ b/backend-service/build.sbt
@@ -19,6 +19,7 @@ libraryDependencies ++= Seq(
   "org.slf4j" % "slf4j-api" % "1.7.21",
   "org.jasypt" % "jasypt" % "1.9.2",
   "org.apache.kafka" % "kafka_2.10" % "0.10.0.1",
-  "org.apache.kafka" % "kafka-clients" % "0.10.0.1"
+  "org.apache.kafka" % "kafka-clients" % "0.10.0.1",
+  "org.easytesting" % "fest-assert-core" % "2.0M8"
 ).map(_.exclude("log4j", "log4j"))
   .map(_.exclude("org.slf4j", "slf4j-log4j12"))
diff --git a/backend-service/test/actors/ConfigUtilTest.java b/backend-service/test/actors/ConfigUtilTest.java
index 850a058a80..8e2e708f5f 100644
--- a/backend-service/test/actors/ConfigUtilTest.java
+++ b/backend-service/test/actors/ConfigUtilTest.java
@@ -23,19 +23,20 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Properties;
 
-import static org.junit.Assert.assertThat;
+import static org.fest.assertions.api.Assertions.*;
 
 public class ConfigUtilTest {
 
   @Test
   public void shouldGenerateEtlJobDefaultCommand() {
     // when:
-    String command = ConfigUtil.generateCommand(0L, "", new Properties());
+    String command = ConfigUtil.generateCommand(EtlJobName.HADOOP_DATASET_METADATA_ETL, 0L, "", new Properties());
 
     // then:
     assertThat(command)
             .startsWith("java -cp ")
             .contains(" -Dconfig=/var/tmp/wherehows/exec/0.properties ")
+            .contains(" -DCONTEXT=HADOOP_DATASET_METADATA_ETL ")
             .endsWith(" metadata.etl.Launcher");
   }
 
@@ -48,12 +49,13 @@ public class ConfigUtilTest {
     etlJobProperties.put(Constant.WH_APP_FOLDER_KEY, applicationDirectory);
 
     // when:
-    String command = ConfigUtil.generateCommand(1L, "", etlJobProperties);
+    String command = ConfigUtil.generateCommand(EtlJobName.LDAP_USER_ETL, 1L, "", etlJobProperties);
 
     // then:
     assertThat(command)
             .startsWith("java -cp ")
             .contains(" -Dconfig=" + applicationDirectory + "/exec/1.properties ")
+            .contains(" -DCONTEXT=LDAP_USER_ETL ")
             .endsWith(" metadata.etl.Launcher");
   }
 
@@ -68,8 +70,7 @@ public class ConfigUtilTest {
     final File propertiesFile = createTemporaryPropertiesFile(whEtlExecId, etlJobProperties);
 
     // when:
-    final EtlJobName etlJobName = EtlJobName.valueOf("HIVE_DATASET_METADATA_ETL");
-    ConfigUtil.generateProperties(etlJobName, 2, whEtlExecId, etlJobProperties);
+    ConfigUtil.generateProperties(EtlJobName.HIVE_DATASET_METADATA_ETL, 2, whEtlExecId, etlJobProperties);
 
     // then:
     final String content = Files.toString(propertiesFile, Charset.defaultCharset());
diff --git a/backend-service/test/controllers/DatasetControllerTest.java b/backend-service/test/controllers/DatasetControllerTest.java
index 6a3b8d7c3a..1edf17c66c 100644
--- a/backend-service/test/controllers/DatasetControllerTest.java
+++ b/backend-service/test/controllers/DatasetControllerTest.java
@@ -34,7 +34,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static play.test.Helpers.*;
-import static org.junit.Assert.assertThat;
+import static org.fest.assertions.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 
diff --git a/web/build.gradle b/web/build.gradle
index ddc8704b7c..da6bc10544 100644
--- a/web/build.gradle
+++ b/web/build.gradle
@@ -54,6 +54,11 @@ task "playCompile" (type: Exec, dependsOn: copyPlayLibs) {
     commandLine playExec, 'compile'
 }
 
+task "playTest" (type: Exec, dependsOn: playCompile) {
+    commandLine playExec, 'test'
+}
+
+
 task "playClean" (type: Exec) {
     commandLine playExec, 'clean'
 }
diff --git a/web/build.sbt b/web/build.sbt
index 940bafa413..85e82cb305 100644
--- a/web/build.sbt
+++ b/web/build.sbt
@@ -13,5 +13,6 @@ libraryDependencies ++= Seq(
   filters,
   "mysql" % "mysql-connector-java" % "5.1.40",
   "org.springframework" % "spring-jdbc" % "4.1.6.RELEASE",
-  "org.mockito" % "mockito-core" % "1.10.19"
+  "org.mockito" % "mockito-core" % "1.10.19",
+  "org.easytesting" % "fest-assert-core" % "2.0M8"
 )
diff --git a/web/test/ApplicationTest.java b/web/test/ApplicationTest.java
index 5a17b810ce..7ff85bbc73 100644
--- a/web/test/ApplicationTest.java
+++ b/web/test/ApplicationTest.java
@@ -1,9 +1,10 @@
 import org.junit.*;
 
-import play.mvc.*;
+import play.twirl.api.Content;
+
 
 import static play.test.Helpers.*;
-import static org.fest.assertions.Assertions.*;
+import static org.fest.assertions.api.Assertions.*;
 
 
 public class ApplicationTest {
@@ -12,7 +13,7 @@ public class ApplicationTest {
     private static String FAKE_CSRF_TOKEN = "token";
     @Test
     public void renderTemplate() {
-        Content html = views.html.index.render(TEST_USER, FAKE_CSRF_TOKEN);
+        Content html = views.html.index.render(TEST_USER, FAKE_CSRF_TOKEN, true, 1234);
         assertThat(contentType(html)).isEqualTo("text/html");
     }
 
diff --git a/web/test/ControllersTest.java b/web/test/ControllersTest.java
index 6ca6ae7e0f..780f161de6 100644
--- a/web/test/ControllersTest.java
+++ b/web/test/ControllersTest.java
@@ -5,11 +5,11 @@ import controllers.api.v1.Dataset;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import play.Logger;
 import play.libs.Json;
 
-import play.mvc.Content;
 import play.mvc.Http;
 import play.mvc.Result;
 import play.test.FakeApplication;
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static play.test.Helpers.*;
-import static org.fest.assertions.Assertions.*;
+import static org.fest.assertions.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 
@@ -113,37 +113,37 @@ public class ControllersTest {
         assertThat(sampleNode.isContainerNode());
         //assertThat(sampleNode.get("status").asText()).isEqualTo("ok");
 
-        result = controllers.api.v1.Dataset.getDatasetInstances(datasetId);
+        result = controllers.api.v1.Dataset.getDatasetInstances(datasetId.longValue());
         assertThat(status(result)).isEqualTo(OK);
         JsonNode instanceNode = Json.parse(contentAsString(result));
         assertThat(instanceNode.isContainerNode());
         assertThat(instanceNode.get("status").asText()).isEqualTo("ok");
 
-        result = controllers.api.v1.Dataset.getDatasetVersions(datasetId, DB_ID);
+        result = controllers.api.v1.Dataset.getDatasetVersions(datasetId.longValue(), DB_ID);
         assertThat(status(result)).isEqualTo(OK);
         JsonNode versionNode = Json.parse(contentAsString(result));
         assertThat(versionNode.isContainerNode());
         assertThat(versionNode.get("status").asText()).isEqualTo("ok");
 
-        result = controllers.api.v1.Dataset.getReferenceViews(datasetId);
+        result = controllers.api.v1.Dataset.getReferenceViews(datasetId.longValue());
         assertThat(status(result)).isEqualTo(OK);
         JsonNode referenceNode = Json.parse(contentAsString(result));
         assertThat(referenceNode.isContainerNode());
         assertThat(referenceNode.get("status").asText()).isEqualTo("ok");
 
-        result = controllers.api.v1.Dataset.getDependViews(datasetId);
+        result = controllers.api.v1.Dataset.getDependViews(datasetId.longValue());
         assertThat(status(result)).isEqualTo(OK);
         JsonNode dependsNode = Json.parse(contentAsString(result));
         assertThat(dependsNode.isContainerNode());
         assertThat(dependsNode.get("status").asText()).isEqualTo("ok");
 
-        result = controllers.api.v1.Dataset.getDatasetSchemaTextByVersion(datasetId, '0.0.1');
+        result = controllers.api.v1.Dataset.getDatasetSchemaTextByVersion(datasetId.longValue(), "0.0.1");
         assertThat(status(result)).isEqualTo(OK);
         JsonNode schemaTextNode = Json.parse(contentAsString(result));
         assertThat(schemaTextNode.isContainerNode());
         assertThat(schemaTextNode.get("status").asText()).isEqualTo("ok");
 
-        result = controllers.api.v1.Dataset.getDatasetAccess(datasetId)
+        result = controllers.api.v1.Dataset.getDatasetAccess(datasetId.longValue());
         assertThat(status(result)).isEqualTo(OK);
         JsonNode accessNode = Json.parse(contentAsString(result));
         assertThat(accessNode.isContainerNode());
diff --git a/web/test/IntegrationTest.java b/web/test/IntegrationTest.java
index 50c0106c53..da32eeee97 100644
--- a/web/test/IntegrationTest.java
+++ b/web/test/IntegrationTest.java
@@ -1,9 +1,9 @@
 import org.junit.*;
 
-import play.libs.WS;
+import play.libs.ws.WS;
 
 import static play.test.Helpers.*;
-import static org.fest.assertions.Assertions.*;
+import static org.fest.assertions.api.Assertions.*;
 
 public class IntegrationTest {