LPS-47337 Some fixes to test support in SDK