Test Fixes - LPS-45503 changed implementation that LPS-45554 tested

Pushed to upstream