trying to fix the broken testing.. all paths shold work a bit better now