diff --git a/.gitignore b/.gitignore
index f512932c..36df49eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,3 +115,6 @@ static/org.geppetto.frontend
 pygeppetto_server/
 tags
 pygeppetto-django
+static/projects/model.xmi
+static/projects/nml_model.nml
+static/projects/project.json
diff --git a/Makefile b/Makefile
index 04a82283..b6d02f21 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ git-install-hooks:
 	cp service/hooks/* .git/hooks
 
 git-clean-local: git-check-on-dev
-	for b in `git branch --list "feature/*" --merged`; do git branch -d "$$b"; done;
+	for b in `git branch --list "feature_*" --merged`; do git branch -d "$$b"; done;
 
 git-check-on-dev:
 	@git status -b -s | grep "## development...origin/development"
diff --git a/scidash/account/auth.py b/scidash/account/auth.py
index 662a80e1..d00bd79e 100644
--- a/scidash/account/auth.py
+++ b/scidash/account/auth.py
@@ -2,6 +2,5 @@
 
 
 class CsrfExemptSessionAuthentication(SessionAuthentication):
-
     def enforce_csrf(self, request):
         return  # To not perform the csrf check previously happening
diff --git a/scidash/sciunitmodels/api/views.py b/scidash/sciunitmodels/api/views.py
index 67cb550f..9cfe889b 100644
--- a/scidash/sciunitmodels/api/views.py
+++ b/scidash/sciunitmodels/api/views.py
@@ -22,6 +22,5 @@ class ModelClassViewSet(viewsets.ReadOnlyModelViewSet):
 class ModelInstanceViewSet(viewsets.ModelViewSet):
     queryset = ModelInstance.objects.all()
     serializer_class = ModelInstanceSerializer
-    permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
+    permission_classes = (permissions.IsAuthenticatedOrReadOnly, )
     filter_class = ModelInstanceFilter
-
diff --git a/scidash/sciunitmodels/models.py b/scidash/sciunitmodels/models.py
index 6ce2dd1b..86ebe6c0 100644
--- a/scidash/sciunitmodels/models.py
+++ b/scidash/sciunitmodels/models.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+
 from datetime import date
 
 from django.contrib.contenttypes.fields import GenericRelation
diff --git a/scidash/sciunitmodels/serializers.py b/scidash/sciunitmodels/serializers.py
index 9b574b4b..02b495b9 100644
--- a/scidash/sciunitmodels/serializers.py
+++ b/scidash/sciunitmodels/serializers.py
@@ -3,10 +3,10 @@
 from rest_framework_cache.registry import cache_registry
 from rest_framework_cache.serializers import CachedSerializerMixin
 
+from scidash.account.serializers import ScidashUserSerializer
 from scidash.general.mixins import GetByKeyOrCreateMixin
 from scidash.general.serializers import TagSerializer
 from scidash.sciunitmodels.models import Capability, ModelClass, ModelInstance
-from scidash.account.serializers import ScidashUserSerializer
 
 
 class CapabilitySerializer(
@@ -43,7 +43,6 @@ class ModelInstanceSerializer(
         default=serializers.CurrentUserDefault(), read_only=True
     )
 
-
     key = 'hash_id'
 
     class Meta:
diff --git a/scidash/sciunittests/filters.py b/scidash/sciunittests/filters.py
index cf1882e3..bc66afdc 100644
--- a/scidash/sciunittests/filters.py
+++ b/scidash/sciunittests/filters.py
@@ -14,7 +14,7 @@ class TestInstanceFilter(filters.FilterSet):
     owner = filters.CharFilter(name='owner__username', lookup_expr='icontains')
 
     name = filters.CharFilter(
-        name='test_class__class_name', lookup_expr='icontains'
+        name='name', lookup_expr='icontains'
     )
 
     timestamp_from = filters.IsoDateTimeFilter(
diff --git a/scidash/sciunittests/models.py b/scidash/sciunittests/models.py
index fb0caf58..1766c8c7 100644
--- a/scidash/sciunittests/models.py
+++ b/scidash/sciunittests/models.py
@@ -41,7 +41,9 @@ class TestInstance(models.Model):
     name = models.CharField(max_length=200, default='Default Name')
     test_class = models.ForeignKey(TestClass)
     observation = JSONField()
-    test_suites = models.ManyToManyField(TestSuite, related_name='tests', blank=True)
+    test_suites = models.ManyToManyField(
+        TestSuite, related_name='tests', blank=True
+    )
     description = models.TextField(blank=True, null=True)
     owner = models.ForeignKey(general_models.ScidashUser, null=True)
     verbose = models.IntegerField(default=0)
diff --git a/service/hooks/pre-commit b/service/hooks/pre-commit
new file mode 100644
index 00000000..963e6a18
--- /dev/null
+++ b/service/hooks/pre-commit
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+make lint
diff --git a/static/projects/.gitkeep b/static/projects/.gitkeep
new file mode 100644
index 00000000..e69de29b