[PLAT-5206] Extend test coverage and fix error