LPS-39077 improve tests