BS-9048, fix compile of tests