Merge "Refactor policy/api csit tests"