Fix Broken Unit Tests
LPS-36045 - paths
LPS-36050 - paths
LPS-36055 - paths
LPS-36055 - paths
LPS-35652 Minor visual improvements