PLAT-5698 - Fix tests