LPS-50051 Further cleanup
LPS-50051 Update test to be fully covered
LPS-50051 SF