PLAT-3466 - Fix unit tests