PLA-915 fix for tests