diff --git a/views/ngXosViews/ceilometerDashboard/package.json b/views/ngXosViews/ceilometerDashboard/package.json
index b609796..9562eb4 100644
--- a/views/ngXosViews/ceilometerDashboard/package.json
+++ b/views/ngXosViews/ceilometerDashboard/package.json
@@ -8,6 +8,7 @@
     "prebuild": "npm install && bower install",
     "build": "gulp",
     "test": "karma start",
+    "test:ci": "karma start --single-run",
     "lint": "eslint src/js/"
   },
   "keywords": [
diff --git a/xos/configurations/test-standalone/Makefile b/xos/configurations/test-standalone/Makefile
index f00979f..87aaa49 100644
--- a/xos/configurations/test-standalone/Makefile
+++ b/xos/configurations/test-standalone/Makefile
@@ -42,6 +42,13 @@
 	# RUN TESTS
 	sudo docker exec -i teststandalone_xos_1 bash -c "cd /opt/xos/tests/api; npm test"
 
+test-tosca:
+	sudo docker-compose run xos bash -c "cd /opt/xos/tosca/tests; python ./alltests.py"
+
+test-gui:
+	cd ../../../views/ngXosViews/ceilometerDashboard; npm install
+	cd ../../../views/ngXosViews/ceilometerDashboard; npm run test:ci
+
 base-container: 
 	cd ../../../containers/xos; make devel
 
@@ -57,6 +64,9 @@
 rm: stop
 	sudo docker-compose rm
 
+docker-clean:
+	sudo docker rm -f $(sudo docker ps -aq)
+
 enter-xos:
 	sudo docker exec -ti teststandalone_xos_1 bash