Delete test, merge gijs + bugfixes