Started to fix testling setup