LPS-36374
Test Fixes - paths