diff --git a/Makefile b/Makefile
index 97eab7c..3bf2403 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ lint:
 
 lint-roll:
 	isort --recursive <MODULE_NAME> tests
-	$(make) lint
+	$(MAKE) lint
 
 test:
 	py.test tests
diff --git a/fill_template_vars.sh b/fill_template_vars.sh
index a0f9b90..17f2503 100755
--- a/fill_template_vars.sh
+++ b/fill_template_vars.sh
@@ -38,3 +38,6 @@ sed -i "s/<SHORT_DESCRIPTION>/$SHORT_DESCRIPTION/g" $TEMPLATE_FILES
 
 mkdir $MODULE_NAME
 touch $MODULE_NAME/__init__.py
+
+# template filler is no longer needed, delete it
+rm "$0"
diff --git a/pytest.ini b/pytest.ini
index 9cc5a18..d53de3a 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,7 @@
 [pytest]
 addopts= -v --showlocals --durations 10
 python_paths= .
+xfail_strict=true
 
 [pytest-watch]
 runner= py.test --failed-first --maxfail=1 --no-success-flaky-report