LPS-34951
LPS-34951 - Integration Tests
LPS-34895
LPS-34895 Remove duplicate code