LPS-44359 Fix upstream tests

This pull will fix a lot of upstream tests.

cc: @mdelapenya