Fixing more test stuff, removing path var