bug fix + start on combi test