PLA-1584 fast unit test fixes