Adding testscripts, fixing delete-function