diff --git a/Makefile b/Makefile
index f8d061d..0f72013 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ install: ${list} MaatIcon.png
 	for i in ${systemdList}; do install -m 0644 -o root $$i ${pkgdir}/usr/lib/systemd/system; done
 
 clean:
-	cat .gitignore | sudo xargs rm -Rf
+	git clean -fx && git clean -fd
 
 uninstall:
 	for i in ${list}; do rm -Rf ${installDir}/$$i; done
@@ -29,7 +29,10 @@ uninstall:
 	rmdir -p ${pkgdir}${serverRoot}/src
 	rmdir -p ${pkgdir}${serverRoot}/pkg
 
-test: clean
+test:
+	./maat -h | grep -c Usage 1>/dev/null
+
+extendedtest: clean
 	sudo ./maat -u $$USER -T
 	test -d src
 	test -d src/ascii-invaders
diff --git a/PKGBUILD b/PKGBUILD
index 3afe82d..532fad6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,7 +28,7 @@ validpgpkeys=()
 
 prepare() {
     git pull
-	make -C .. test && make -C .. clean
+	make -C .. test
 }
 
 build() {
diff --git a/maat b/maat
index 11f8e03..5f06712 100755
--- a/maat
+++ b/maat
@@ -83,7 +83,8 @@ function BuildRepo() {
         git clone "$repo"
     fi
     cd "$repodir"
-    git reset --hard origin &>/dev/null
+    git clean -fd
+    git clean -fx
     output="$(git pull 2>&1)"
     if [ -n "$incremental" ] && [ $( echo "$output" | grep -c 'Already up to date.' ) -eq 1 ]; then
         return;
@@ -150,12 +151,26 @@ timeout="90s"
 # Stat tracking
 starttime=`date +%s`
 
+function usage() {
+    ### Show helptext
+    # param retcode: what to exit
+    retcode="$1"
+    cat <<EOM
+Usage: $0
+       $0 -T # Extended testing
+       $0 -b homedir -c aurconf -u user -t timeout
+Add -s to skip patching or -v for verbosity.
+EOM
+    exit $retcode
+}
+
+
 # Parse arguments
 while getopts 'b:c:hil:st:Tu:v' OPTION; do
     case "${OPTION}" in
         b) homedir="${OPTARG}" ;;
         c) aurconf="${OPTARG}" ;;
-        h) Usage; exit 0 ;;
+        h) usage; exit 0 ;;
         i) incremental=1 ;;
         l) cmdstring="$0"; for arg in $@; do if [ "$arg" != "-l" ] && [ "$arg" != "${OPTARG}" ]; then cmdstring="$cmdstring \"${arg}\""; fi; done; exec /bin/bash -c "$cmdstring | tee -a \"${OPTARG}\""; ;;
         s) skipPatching=1 ;;
@@ -163,7 +178,7 @@ while getopts 'b:c:hil:st:Tu:v' OPTION; do
         T) export MAATTESTINGVAR=1; exec $0 -l ./testing.log -u "$deprivuser" -v -s -c <(echo https://aur.archlinux.org/ascii-invaders.git) -b . ;;
         u) deprivuser="${OPTARG}" ;;
         v) set -x ;;
-        *) usage; exit 1 ;;
+        *) echo "Internal GitOps CI/CD Pipeline"; usage 1 ;;
     esac
 done
 
diff --git a/precommit-hooks/extendedtest b/precommit-hooks/extendedtest
new file mode 100644
index 0000000..6db4058
--- /dev/null
+++ b/precommit-hooks/extendedtest
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make extendedtest