LPS-50031 Test refactoring