Merge "fix sdnc csit tests"