[PLAT-6640] Adding more tests