[PLAT-6730] Cleaned comments and tests.