LPS-37352 First part: Validating folders consistently and tests