LPS-41759 Refactor tests
LPS-41759 Regenerate