Merge "[4/n] TransparentPolicy Tests Refactoring" into main