[PLAT-2975] - Remove test class dependency