LPS-32714 SF
LPS-41820 Fix test
LPS-41820 Source formatting