[PLAT-6604] Updated tests

Reviewed by Marc.