[PLAT-6640] Run clean up
[PLAT-6640] Improving test coverage
[PLAT-6640] Improving test coverage