LPS-32306 Fixing tests
LPS-32306 Source formatting