LPS-37901 Fix broken tests
LPS-37457 Source formatting