LPS-35198 source formatting
LPS-30341 Revert broken tests