BS-9048, fix unit tests