diff --git a/shippable.yml b/shippable.yml
index 87c4d13..bb94bba 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -1,22 +1,34 @@
 language: java
 
 jdk:
-   - openjdk7
-   - oraclejdk7
-   - openjdk6
 
-after_success:
-   - mvn clean cobertura:cobertura
-   - mvn test
- 
-script: mvn --version
+oraclejdk8 env: # - NODE_ENV=production
+git:
+submodules: false
 
+branches:
+ only:
+  - test-yml
+  - master
 
-notifications:
-  email: false
+before_install:
+  - npm install yo
+  - npm install bower
+  - npm install grunt-cli
+  
+install:
+  - bower install
+  - npm install
 
+before_script:
+  - mkdir -p shippable/test-results
+  - mkdir -p shippable/code-coverage
+  - psql -c 'create role billingone with LOGIN PASSWORD ‘password’;'
+  - psql -c 'create database billingone;'
+  - psql -c 'create database billingone_test;'
+  - psql -c 'grant create on database billingone to billingone;'
+  - psql -c 'grant create on database billingone_test to billingone;'
 
-archive: true
-
-parallelized_test: true
-#cache: true
+script:
+ - spring_profiles_active=test gradle cleanTest test
+ - grunt test
diff --git a/src/test/java/TestApp.java b/src/test/java/TestApp.java
index 4688630..6e74223 100644
--- a/src/test/java/TestApp.java
+++ b/src/test/java/TestApp.java
@@ -1,6 +1,7 @@
 import junit.framework.*;
 import main.App;
 
+
 public class TestApp extends TestCase {
   public void testInsertAndGetData() {
     String result = "";
@@ -8,7 +9,7 @@ public void testInsertAndGetData() {
       App app = new App();
       result = app.getData();
     } finally {
-      assertEquals("Hope this works!", result);
+      assertEquals("Hope this test works!", result);
     }
   } 
 }