LPS-33680 refactor tests