Various fixes for next test. moved back config to enduro. Henrik Karl