fix testrun stuff
Merge branch 'fix-testrun' into development